diff --git a/packages/integration-test/test/scheduled/erc20-fee-proxy.test.ts b/packages/integration-test/test/scheduled/erc20-fee-proxy.test.ts
index 434fe1c0cc..83f5081f94 100644
--- a/packages/integration-test/test/scheduled/erc20-fee-proxy.test.ts
+++ b/packages/integration-test/test/scheduled/erc20-fee-proxy.test.ts
@@ -15,7 +15,6 @@ import {
 import { createMockErc20FeeRequest } from '../utils';
 
 const erc20FeeProxy = new Erc20PaymentNetwork.ERC20FeeProxyPaymentDetector({
-  // FIXME: the mocked advanced logic is address based
   advancedLogic: mockAdvancedLogic,
   currencyManager: CurrencyManager.getDefault(),
   getSubgraphClient: jest.fn(),
diff --git a/packages/payment-detection/src/btc/address-based.ts b/packages/payment-detection/src/btc/address-based.ts
index 846684e8ae..007cb7e9d7 100644
--- a/packages/payment-detection/src/btc/address-based.ts
+++ b/packages/payment-detection/src/btc/address-based.ts
@@ -7,7 +7,7 @@ import { PaymentDetectorBase } from '../payment-detector-base';
  */
 export abstract class BtcAddressBasedDetector extends PaymentDetectorBase<
   ExtensionTypes.PnAddressBased.IAddressBased<ExtensionTypes.PnAddressBased.ICreationParameters>,
-  PaymentTypes.IBTCPaymentEventParameters
+  PaymentTypes.GenericEventParameters
 > {
   /**
    * @param extension The advanced logic payment network extensions
@@ -74,7 +74,7 @@ export abstract class BtcAddressBasedDetector extends PaymentDetectorBase<
    */
   protected async getEvents(
     request: RequestLogicTypes.IRequest,
-  ): Promise<PaymentTypes.AllNetworkEvents<PaymentTypes.IBTCPaymentEventParameters>> {
+  ): Promise<PaymentTypes.AllNetworkEvents<PaymentTypes.GenericEventParameters>> {
     const { paymentAddress, refundAddress } = this.getPaymentExtension(request).values;
 
     this.checkRequiredParameter(paymentAddress, 'paymentAddress');
diff --git a/packages/request-client.js/test/api/content-data-manager.test.ts b/packages/request-client.js/test/api/content-data-manager.test.ts
index 2fd94bc5bc..5d8b4f3418 100644
--- a/packages/request-client.js/test/api/content-data-manager.test.ts
+++ b/packages/request-client.js/test/api/content-data-manager.test.ts
@@ -5,14 +5,12 @@ import ContentDataExtension from '../../src/api/content-data-extension';
 import * as TestData from './data-for-content-data-extension';
 import { IAdvancedLogicExtensions } from '@requestnetwork/types/src/advanced-logic-types';
 
-const mockAdvancedLogic: AdvancedLogicTypes.IAdvancedLogic = {
+const mockAdvancedLogic = {
   applyActionToExtensions: jest.fn(),
-  getNativeTokenExtensionForNetwork: jest.fn(),
-  getAnyToNativeTokenExtensionForNetwork: jest.fn(),
   extensions: {
     contentData: { createCreationAction: jest.fn() },
   } as any as IAdvancedLogicExtensions,
-};
+} as any as AdvancedLogicTypes.IAdvancedLogic;
 
 let contentDataExtension: ContentDataExtension;
 
diff --git a/packages/request-client.js/test/index.test.ts b/packages/request-client.js/test/index.test.ts
index e5d334ac58..47349ad375 100644
--- a/packages/request-client.js/test/index.test.ts
+++ b/packages/request-client.js/test/index.test.ts
@@ -81,7 +81,7 @@ const requestParameters: RequestLogicTypes.ICreateParameters = {
 
 const mockBTCProvider = {
   getAddressBalanceWithEvents: (): Promise<
-    PaymentTypes.IBalanceWithEvents<PaymentTypes.IBTCPaymentEventParameters>
+    PaymentTypes.IBalanceWithEvents<PaymentTypes.GenericEventParameters>
   > => {
     return Promise.resolve({
       balance: '666743',
diff --git a/packages/request-logic/test/index.test.ts b/packages/request-logic/test/index.test.ts
index d0b3cbd0dc..903eafa9f6 100644
--- a/packages/request-logic/test/index.test.ts
+++ b/packages/request-logic/test/index.test.ts
@@ -37,12 +37,10 @@ const fakeMetaTransactionManager = {
 };
 let fakeTransactionManager: TransactionTypes.ITransactionManager;
 
-const fakeAdvancedLogicBase: AdvancedLogicTypes.IAdvancedLogic = {
-  getAnyToNativeTokenExtensionForNetwork: jest.fn(),
-  getNativeTokenExtensionForNetwork: jest.fn(),
+const fakeAdvancedLogicBase = {
   applyActionToExtensions: jest.fn(),
   extensions: {} as AdvancedLogicTypes.IAdvancedLogicExtensions,
-};
+} as any as AdvancedLogicTypes.IAdvancedLogic;
 
 /* eslint-disable @typescript-eslint/no-unused-expressions */
 describe('index', () => {
diff --git a/packages/request-logic/test/unit/requestLogicCore.test.ts b/packages/request-logic/test/unit/requestLogicCore.test.ts
index bb85cfcf68..3728b27daf 100644
--- a/packages/request-logic/test/unit/requestLogicCore.test.ts
+++ b/packages/request-logic/test/unit/requestLogicCore.test.ts
@@ -15,14 +15,12 @@ import * as TestData from './utils/test-data-generator';
 
 import RequestLogicCore from '../../src/requestLogicCore';
 
-const fakeAdvancedLogic: AdvancedLogicTypes.IAdvancedLogic = {
-  getAnyToNativeTokenExtensionForNetwork: jest.fn(),
-  getNativeTokenExtensionForNetwork: jest.fn(),
+const fakeAdvancedLogic = {
   applyActionToExtensions: (
     extensionStates: RequestLogicTypes.IExtensionStates,
   ): RequestLogicTypes.IExtensionStates => extensionStates,
   extensions: {} as AdvancedLogicTypes.IAdvancedLogicExtensions,
-};
+} as any as AdvancedLogicTypes.IAdvancedLogic;
 
 /* eslint-disable @typescript-eslint/no-unused-expressions */
 describe('requestLogicCore', () => {
diff --git a/packages/transaction-manager/README.md b/packages/transaction-manager/README.md
index 3201133ec1..adc164e9cc 100644
--- a/packages/transaction-manager/README.md
+++ b/packages/transaction-manager/README.md
@@ -17,7 +17,7 @@ npm install @requestnetwork/transaction-manager
 In order to decrypt encrypted transactions, you must provide a decryption provider.
 You can see the specification of decryption provider [here](./specs/decryption-provider.md).
 
-An example of implementation of a decryption provider is available in the package: [epk-decryption](../../epk-decryption)
+An example of implementation of a decryption provider is available in the package: [epk-decryption](../epk-decryption/)
 
 ```javascript
 import EthereumPrivateKeyDecryptionProvider from '@requestnetwork/epk-decryption';
diff --git a/packages/types/src/extension-types.ts b/packages/types/src/extension-types.ts
index b2345a80db..5331df4e34 100644
--- a/packages/types/src/extension-types.ts
+++ b/packages/types/src/extension-types.ts
@@ -23,13 +23,13 @@ export {
 };
 
 /** Extension interface is extended by the extensions implementation */
-export interface IExtension<T = any> {
+export interface IExtension<TCreationParameters = any> {
   extensionType: TYPE;
   extensionId: ID;
   currentVersion: string;
   applyActionToExtension: (
     extensionsState: RequestLogic.IExtensionStates,
-    extensionAction: IAction<T>,
+    extensionAction: IAction<TCreationParameters>,
     requestState: RequestLogic.IRequest,
     actionSigner: Identity.IIdentity,
     timestamp: number,
diff --git a/packages/types/src/payment-types.ts b/packages/types/src/payment-types.ts
index 5cd91e44d1..d44c31b996 100644
--- a/packages/types/src/payment-types.ts
+++ b/packages/types/src/payment-types.ts
@@ -192,7 +192,7 @@ export type ERC777BalanceWithEvents = IBalanceWithEvents<IERC777PaymentEventPara
  * ERC20 networks and events
  */
 
-/** Parameters for events of ERC20 payments */
+/** Parameters detectable payment events */
 export interface GenericEventParameters {
   block?: number;
   txHash?: string;
@@ -274,18 +274,13 @@ export interface IBitcoinDetectionProvider {
     bitcoinNetworkId: number,
     address: string,
     eventName: EVENTS_NAMES,
-  ) => Promise<IBalanceWithEvents<IBTCPaymentEventParameters>>;
+  ) => Promise<IBalanceWithEvents<GenericEventParameters>>;
 }
 
-/** Parameters for events of BTC payments */
-export interface IBTCPaymentEventParameters {
-  block?: number;
-  txHash?: string;
-}
 /** BTC Payment Network Event */
-export type BTCPaymentNetworkEvent = IPaymentNetworkEvent<IBTCPaymentEventParameters>;
+export type BTCPaymentNetworkEvent = IPaymentNetworkEvent<GenericEventParameters>;
 /** BTC BalanceWithEvents */
-export type BTCBalanceWithEvents = IBalanceWithEvents<IBTCPaymentEventParameters>;
+export type BTCBalanceWithEvents = IBalanceWithEvents<GenericEventParameters>;
 
 /** Parameters for escrow events from EscrowERC20 contract state changes */
 export interface IEscrowEventParameters extends Required<GenericEventParameters> {