From 7b97ed9bef888d83a28aad00cc164f3046368349 Mon Sep 17 00:00:00 2001
From: CJ42 <cavallerajean@gmail.com>
Date: Tue, 19 Sep 2023 11:25:52 +0100
Subject: [PATCH] test: change back param name from `allowNonLSP1Recipient` to
 `force`

---
 .../Interactions/BatchExecute.test.ts         |   2 +-
 .../LSP7CompatibleERC20.behaviour.ts          |  84 ++++-----
 .../LSP7DigitalAsset.behaviour.ts             | 162 ++++++++----------
 .../LSP7Mintable.behaviour.ts                 |   2 +-
 .../LSP8CompatibleERC721.behaviour.ts         |  34 +---
 .../LSP8IdentifiableDigitalAsset.behaviour.ts | 151 +++++++---------
 .../LSP8Mintable.behaviour.ts                 |   2 +-
 7 files changed, 188 insertions(+), 249 deletions(-)

diff --git a/tests/LSP6KeyManager/Interactions/BatchExecute.test.ts b/tests/LSP6KeyManager/Interactions/BatchExecute.test.ts
index 336e5fe95..0e99eaa92 100644
--- a/tests/LSP6KeyManager/Interactions/BatchExecute.test.ts
+++ b/tests/LSP6KeyManager/Interactions/BatchExecute.test.ts
@@ -327,7 +327,7 @@ export const shouldBehaveLikeBatchExecute = (
         [sender, sender, sender], // address[] memory from,
         recipients, // address[] memory to,
         amounts, // uint256[] memory amount,
-        [true, true, true], // bool[] memory allowNonLSP1Recipient,
+        [true, true, true], // bool[] memory force,
         ['0x', '0x', '0x'], // bytes[] memory data
       ]);
 
diff --git a/tests/LSP7DigitalAsset/LSP7CompatibleERC20.behaviour.ts b/tests/LSP7DigitalAsset/LSP7CompatibleERC20.behaviour.ts
index 49c673d57..831a6ad1e 100644
--- a/tests/LSP7DigitalAsset/LSP7CompatibleERC20.behaviour.ts
+++ b/tests/LSP7DigitalAsset/LSP7CompatibleERC20.behaviour.ts
@@ -422,7 +422,7 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
       from: string;
       to: string;
       amount: BigNumber;
-      allowNonLSP1Recipient?: boolean;
+      force?: boolean;
       data?: string;
     };
 
@@ -450,7 +450,7 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
           txParams.from,
           txParams.to,
           txParams.amount,
-          txParams.allowNonLSP1Recipient ?? true,
+          txParams.force ?? true,
           expectedData,
         );
 
@@ -810,13 +810,13 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
 
         describe('when caller (msg.sender) is the `from` address', () => {
           describe('when `to` is an EOA', () => {
-            it('should allow transfering the tokens with `allowNonLSP1Recipient` param = true', async () => {
+            it('should allow transfering the tokens with `force` param = true', async () => {
               const txParams = {
                 operator: context.accounts.owner,
                 from: context.accounts.owner.address,
                 to: context.accounts.tokenReceiver.address,
                 amount: transferAmount,
-                allowNonLSP1Recipient: true,
+                force: true,
                 data: expectedData,
               };
 
@@ -829,20 +829,20 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
                       txParams.from,
                       txParams.to,
                       txParams.amount,
-                      txParams.allowNonLSP1Recipient,
+                      txParams.force,
                       txParams.data,
                     ),
                 expectedData,
               );
             });
 
-            it('should NOT allow transfering the tokens with `allowNonLSP1Recipient` param = false', async () => {
+            it('should NOT allow transfering the tokens with `force` param = false', async () => {
               const txParams = {
                 operator: context.accounts.owner,
                 from: context.accounts.owner.address,
                 to: context.accounts.tokenReceiver.address,
                 amount: transferAmount,
-                allowNonLSP1Recipient: false,
+                force: false,
                 data: expectedData,
               };
 
@@ -856,7 +856,7 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
                     txParams.from,
                     txParams.to,
                     txParams.amount,
-                    txParams.allowNonLSP1Recipient,
+                    txParams.force,
                     txParams.data,
                   ),
               )
@@ -874,13 +874,13 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
 
           describe('when `to` is a contract', () => {
             describe('when receiving contract supports LSP1', () => {
-              it('should allow transfering the tokens with `allowNonLSP1Recipient` param = true', async () => {
+              it('should allow transfering the tokens with `force` param = true', async () => {
                 const txParams = {
                   operator: context.accounts.owner,
                   from: context.accounts.owner.address,
                   to: deployedContracts.tokenReceiverWithLSP1.address,
                   amount: transferAmount,
-                  allowNonLSP1Recipient: true,
+                  force: true,
                   data: expectedData,
                 };
 
@@ -893,20 +893,20 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
                         txParams.from,
                         txParams.to,
                         txParams.amount,
-                        txParams.allowNonLSP1Recipient,
+                        txParams.force,
                         txParams.data,
                       ),
                   expectedData,
                 );
               });
 
-              it('should allow transfering the tokens with `allowNonLSP1Recipient` param = false', async () => {
+              it('should allow transfering the tokens with `force` param = false', async () => {
                 const txParams = {
                   operator: context.accounts.owner,
                   from: context.accounts.owner.address,
                   to: deployedContracts.tokenReceiverWithLSP1.address,
                   amount: transferAmount,
-                  allowNonLSP1Recipient: false,
+                  force: false,
                   data: expectedData,
                 };
 
@@ -919,7 +919,7 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
                         txParams.from,
                         txParams.to,
                         txParams.amount,
-                        txParams.allowNonLSP1Recipient,
+                        txParams.force,
                         txParams.data,
                       ),
                   expectedData,
@@ -928,13 +928,13 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
             });
 
             describe('when receiving contract does not support LSP1', () => {
-              it('should allow transfering the tokens with `allowNonLSP1Recipient` param = true', async () => {
+              it('should allow transfering the tokens with `force` param = true', async () => {
                 const txParams = {
                   operator: context.accounts.owner,
                   from: context.accounts.owner.address,
                   to: deployedContracts.tokenReceiverWithoutLSP1.address,
                   amount: transferAmount,
-                  allowNonLSP1Recipient: true,
+                  force: true,
                   data: expectedData,
                 };
 
@@ -947,20 +947,20 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
                         txParams.from,
                         txParams.to,
                         txParams.amount,
-                        txParams.allowNonLSP1Recipient,
+                        txParams.force,
                         txParams.data,
                       ),
                   expectedData,
                 );
               });
 
-              it('should NOT allow transfering the tokens with `allowNonLSP1Recipient` param = false', async () => {
+              it('should NOT allow transfering the tokens with `force` param = false', async () => {
                 const txParams = {
                   operator: context.accounts.owner,
                   from: context.accounts.owner.address,
                   to: deployedContracts.tokenReceiverWithoutLSP1.address,
                   amount: transferAmount,
-                  allowNonLSP1Recipient: false,
+                  force: false,
                   data: expectedData,
                 };
 
@@ -974,7 +974,7 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
                       txParams.from,
                       txParams.to,
                       txParams.amount,
-                      txParams.allowNonLSP1Recipient,
+                      txParams.force,
                       txParams.data,
                     ),
                 )
@@ -994,13 +994,13 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
 
         describe('when caller (msg.sender) is an operator (= Not the `from` address)', () => {
           describe('when `to` is an EOA', () => {
-            it('should allow transfering the tokens with `allowNonLSP1Recipient` param = true', async () => {
+            it('should allow transfering the tokens with `force` param = true', async () => {
               const txParams = {
                 operator: context.accounts.operator,
                 from: context.accounts.owner.address,
                 to: context.accounts.tokenReceiver.address,
                 amount: transferAmount,
-                allowNonLSP1Recipient: true,
+                force: true,
                 data: expectedData,
               };
 
@@ -1013,20 +1013,20 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
                       txParams.from,
                       txParams.to,
                       txParams.amount,
-                      txParams.allowNonLSP1Recipient,
+                      txParams.force,
                       txParams.data,
                     ),
                 expectedData,
               );
             });
 
-            it('should NOT allow transfering the tokens with `allowNonLSP1Recipient` param = false', async () => {
+            it('should NOT allow transfering the tokens with `force` param = false', async () => {
               const txParams = {
                 operator: context.accounts.operator,
                 from: context.accounts.owner.address,
                 to: context.accounts.tokenReceiver.address,
                 amount: transferAmount,
-                allowNonLSP1Recipient: false,
+                force: false,
                 data: expectedData,
               };
 
@@ -1040,7 +1040,7 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
                     txParams.from,
                     txParams.to,
                     txParams.amount,
-                    txParams.allowNonLSP1Recipient,
+                    txParams.force,
                     txParams.data,
                   ),
               )
@@ -1058,13 +1058,13 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
 
           describe('when `to` is a contract', () => {
             describe('when receiving contract supports LSP1', () => {
-              it('should allow transfering the tokens with `allowNonLSP1Recipient` param = true', async () => {
+              it('should allow transfering the tokens with `force` param = true', async () => {
                 const txParams = {
                   operator: context.accounts.operator,
                   from: context.accounts.owner.address,
                   to: deployedContracts.tokenReceiverWithLSP1.address,
                   amount: transferAmount,
-                  allowNonLSP1Recipient: true,
+                  force: true,
                   data: expectedData,
                 };
 
@@ -1077,20 +1077,20 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
                         txParams.from,
                         txParams.to,
                         txParams.amount,
-                        txParams.allowNonLSP1Recipient,
+                        txParams.force,
                         txParams.data,
                       ),
                   expectedData,
                 );
               });
 
-              it('should allow transfering the tokens with `allowNonLSP1Recipient` param = false', async () => {
+              it('should allow transfering the tokens with `force` param = false', async () => {
                 const txParams = {
                   operator: context.accounts.operator,
                   from: context.accounts.owner.address,
                   to: deployedContracts.tokenReceiverWithLSP1.address,
                   amount: transferAmount,
-                  allowNonLSP1Recipient: false,
+                  force: false,
                   data: expectedData,
                 };
 
@@ -1103,7 +1103,7 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
                         txParams.from,
                         txParams.to,
                         txParams.amount,
-                        txParams.allowNonLSP1Recipient,
+                        txParams.force,
                         txParams.data,
                       ),
                   expectedData,
@@ -1112,13 +1112,13 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
             });
 
             describe('when receiving contract does not support LSP1', () => {
-              it('should allow transfering the tokens with `allowNonLSP1Recipient` param = true', async () => {
+              it('should allow transfering the tokens with `force` param = true', async () => {
                 const txParams = {
                   operator: context.accounts.operator,
                   from: context.accounts.owner.address,
                   to: deployedContracts.tokenReceiverWithoutLSP1.address,
                   amount: transferAmount,
-                  allowNonLSP1Recipient: true,
+                  force: true,
                   data: expectedData,
                 };
 
@@ -1131,20 +1131,20 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
                         txParams.from,
                         txParams.to,
                         txParams.amount,
-                        txParams.allowNonLSP1Recipient,
+                        txParams.force,
                         txParams.data,
                       ),
                   expectedData,
                 );
               });
 
-              it('should NOT allow transfering the tokens with `allowNonLSP1Recipient` param = false', async () => {
+              it('should NOT allow transfering the tokens with `force` param = false', async () => {
                 const txParams = {
                   operator: context.accounts.operator,
                   from: context.accounts.owner.address,
                   to: deployedContracts.tokenReceiverWithoutLSP1.address,
                   amount: transferAmount,
-                  allowNonLSP1Recipient: false,
+                  force: false,
                   data: expectedData,
                 };
 
@@ -1158,7 +1158,7 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
                       txParams.from,
                       txParams.to,
                       txParams.amount,
-                      txParams.allowNonLSP1Recipient,
+                      txParams.force,
                       txParams.data,
                     ),
                 )
@@ -1189,7 +1189,7 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
               from: context.accounts.owner.address,
               to: deployedContracts.tokenReceiverWithoutLSP1.address,
               amount: ownerBalance.add(1),
-              allowNonLSP1Recipient: true,
+              force: true,
               data: expectedData,
             };
 
@@ -1203,7 +1203,7 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
                   txParams.from,
                   txParams.to,
                   txParams.amount,
-                  txParams.allowNonLSP1Recipient,
+                  txParams.force,
                   txParams.data,
                 ),
             )
@@ -1230,7 +1230,7 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
               from: context.accounts.owner.address,
               to: deployedContracts.tokenReceiverWithoutLSP1.address,
               amount: ownerBalance.add(1),
-              allowNonLSP1Recipient: true,
+              force: true,
               data: expectedData,
             };
 
@@ -1244,7 +1244,7 @@ export const shouldBehaveLikeLSP7CompatibleERC20 = (
                   txParams.from,
                   txParams.to,
                   txParams.amount,
-                  txParams.allowNonLSP1Recipient,
+                  txParams.force,
                   txParams.data,
                 ),
             )
diff --git a/tests/LSP7DigitalAsset/LSP7DigitalAsset.behaviour.ts b/tests/LSP7DigitalAsset/LSP7DigitalAsset.behaviour.ts
index e6f17645a..d965032e1 100644
--- a/tests/LSP7DigitalAsset/LSP7DigitalAsset.behaviour.ts
+++ b/tests/LSP7DigitalAsset/LSP7DigitalAsset.behaviour.ts
@@ -79,35 +79,35 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
 
   describe('when minting tokens', () => {
     describe('when `amount == 0`', () => {
-      it('should revert if `allowNonLSP1Recipient == false`', async () => {
+      it('should revert if `force == false`', async () => {
         const txParams = {
           to: context.accounts.anotherTokenReceiver.address,
           amount: 0,
-          allowNonLSP1Recipient: false,
+          force: false,
           data: '0x',
         };
 
         await expect(
           context.lsp7
             .connect(context.accounts.anyone)
-            .mint(txParams.to, txParams.amount, txParams.allowNonLSP1Recipient, txParams.data),
+            .mint(txParams.to, txParams.amount, txParams.force, txParams.data),
         )
           .to.be.revertedWithCustomError(context.lsp7, 'LSP7NotifyTokenReceiverIsEOA')
           .withArgs(txParams.to);
       });
 
-      it('should pass if `allowNonLSP1Recipient == true`', async () => {
+      it('should pass if `force == true`', async () => {
         const txParams = {
           to: context.accounts.anotherTokenReceiver.address,
           amount: 0,
-          allowNonLSP1Recipient: true,
+          force: true,
           data: '0x',
         };
 
         await expect(
           context.lsp7
             .connect(context.accounts.anyone)
-            .mint(txParams.to, txParams.amount, txParams.allowNonLSP1Recipient, txParams.data),
+            .mint(txParams.to, txParams.amount, txParams.force, txParams.data),
         )
           .to.emit(context.lsp7, 'Transfer')
           .withArgs(
@@ -115,7 +115,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
             ethers.constants.AddressZero,
             txParams.to,
             txParams.amount,
-            txParams.allowNonLSP1Recipient,
+            txParams.force,
             txParams.data,
           );
       });
@@ -126,17 +126,12 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
         const txParams = {
           to: ethers.constants.AddressZero,
           amount: ethers.BigNumber.from('1'),
-          allowNonLSP1Recipient: true,
+          force: true,
           data: '0x',
         };
 
         await expect(
-          context.lsp7.mint(
-            txParams.to,
-            txParams.amount,
-            txParams.allowNonLSP1Recipient,
-            txParams.data,
-          ),
+          context.lsp7.mint(txParams.to, txParams.amount, txParams.force, txParams.data),
         ).to.be.revertedWithCustomError(context.lsp7, 'LSP7CannotSendWithAddressZero');
       });
     });
@@ -146,7 +141,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
         const txParams = {
           to: context.accounts.tokenReceiver.address,
           amount: ethers.BigNumber.from('1'),
-          allowNonLSP1Recipient: true,
+          force: true,
           data: ethers.utils.toUtf8Bytes('we need more tokens'),
         };
 
@@ -154,12 +149,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
         const preBalanceOf = await context.lsp7.balanceOf(txParams.to);
 
         // effects
-        await context.lsp7.mint(
-          txParams.to,
-          txParams.amount,
-          txParams.allowNonLSP1Recipient,
-          txParams.data,
-        );
+        await context.lsp7.mint(txParams.to, txParams.amount, txParams.force, txParams.data);
 
         // post-conditions
         const postBalanceOf = await context.lsp7.balanceOf(txParams.to);
@@ -832,12 +822,12 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
           from: string;
           to: string;
           amount: BigNumber;
-          allowNonLSP1Recipient: boolean;
+          force: boolean;
           data: string;
         };
 
         const transferSuccessScenario = async (
-          { from, to, amount, allowNonLSP1Recipient, data }: TransferTxParams,
+          { from, to, amount, force, data }: TransferTxParams,
           operator: SignerWithAddress,
         ) => {
           // pre-conditions
@@ -846,12 +836,10 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
           const preIsOperatorFor = await context.lsp7.authorizedAmountFor(operator.address, from);
 
           // effect
-          const tx = await context.lsp7
-            .connect(operator)
-            .transfer(from, to, amount, allowNonLSP1Recipient, data);
+          const tx = await context.lsp7.connect(operator).transfer(from, to, amount, force, data);
           await expect(tx)
             .to.emit(context.lsp7, 'Transfer')
-            .withArgs(operator.address, from, to, amount, allowNonLSP1Recipient, data);
+            .withArgs(operator.address, from, to, amount, force, data);
 
           // post-conditions
           const postFromBalanceOf = await context.lsp7.balanceOf(from);
@@ -889,10 +877,10 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
             operator = getOperator();
           });
 
-          describe('when using allowNonLSP1Recipient=true', () => {
-            const allowNonLSP1Recipient = true;
+          describe('when using force=true', () => {
+            const force = true;
             const data = ethers.utils.hexlify(
-              ethers.utils.toUtf8Bytes('doing a transfer with allowNonLSP1Recipient'),
+              ethers.utils.toUtf8Bytes('doing a transfer with force'),
             );
 
             describe('when `to` is an EOA', () => {
@@ -902,7 +890,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                     from: context.accounts.owner.address,
                     to: context.accounts.tokenReceiver.address,
                     amount: context.initialSupply,
-                    allowNonLSP1Recipient,
+                    force,
                     data,
                   };
 
@@ -916,7 +904,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                     from: operator.address,
                     to: ethers.constants.AddressZero,
                     amount: context.initialSupply,
-                    allowNonLSP1Recipient: true,
+                    force: true,
                     data: '0x',
                   };
 
@@ -927,7 +915,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                         txParams.from,
                         txParams.to,
                         txParams.amount,
-                        txParams.allowNonLSP1Recipient,
+                        txParams.force,
                         txParams.data,
                       ),
                   ).to.be.revertedWithCustomError(context.lsp7, 'LSP7CannotSendWithAddressZero');
@@ -942,7 +930,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                     from: context.accounts.owner.address,
                     to: helperContracts.tokenReceiverWithLSP1.address,
                     amount: context.initialSupply,
-                    allowNonLSP1Recipient,
+                    force,
                     data,
                   };
 
@@ -966,7 +954,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                     from: context.accounts.owner.address,
                     to: helperContracts.tokenReceiverWithoutLSP1.address,
                     amount: context.initialSupply,
-                    allowNonLSP1Recipient,
+                    force,
                     data,
                   };
 
@@ -976,10 +964,10 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
             });
           });
 
-          describe('when allowNonLSP1Recipient=false', () => {
-            const allowNonLSP1Recipient = false;
+          describe('when force=false', () => {
+            const force = false;
             const data = ethers.utils.hexlify(
-              ethers.utils.toUtf8Bytes('doing a transfer without allowNonLSP1Recipient'),
+              ethers.utils.toUtf8Bytes('doing a transfer without force'),
             );
 
             describe('when `to` is an EOA', () => {
@@ -988,7 +976,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                   from: context.accounts.owner.address,
                   to: context.accounts.tokenReceiver.address,
                   amount: context.initialSupply,
-                  allowNonLSP1Recipient,
+                  force,
                   data,
                 };
 
@@ -999,7 +987,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                       txParams.from,
                       txParams.to,
                       txParams.amount,
-                      txParams.allowNonLSP1Recipient,
+                      txParams.force,
                       txParams.data,
                     ),
                 )
@@ -1015,7 +1003,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                     from: context.accounts.owner.address,
                     to: helperContracts.tokenReceiverWithLSP1.address,
                     amount: context.initialSupply,
-                    allowNonLSP1Recipient,
+                    force,
                     data,
                   };
 
@@ -1039,7 +1027,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                     from: context.accounts.owner.address,
                     to: helperContracts.tokenReceiverWithoutLSP1.address,
                     amount: context.initialSupply,
-                    allowNonLSP1Recipient,
+                    force,
                     data,
                   };
 
@@ -1050,7 +1038,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                         txParams.from,
                         txParams.to,
                         txParams.amount,
-                        txParams.allowNonLSP1Recipient,
+                        txParams.force,
                         txParams.data,
                       ),
                   )
@@ -1070,7 +1058,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                 from: context.accounts.owner.address,
                 to: context.accounts.tokenReceiver.address,
                 amount: context.initialSupply.add(1),
-                allowNonLSP1Recipient: true,
+                force: true,
                 data: '0x',
               };
 
@@ -1085,7 +1073,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                     txParams.from,
                     txParams.to,
                     txParams.amount,
-                    txParams.allowNonLSP1Recipient,
+                    txParams.force,
                     txParams.data,
                   ),
               )
@@ -1114,7 +1102,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                 from: context.accounts.owner.address,
                 to: context.accounts.owner.address,
                 amount: ethers.BigNumber.from('1'),
-                allowNonLSP1Recipient: true,
+                force: true,
                 data: '0x',
               };
 
@@ -1131,7 +1119,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                     txParams.from,
                     txParams.to,
                     txParams.amount,
-                    txParams.allowNonLSP1Recipient,
+                    txParams.force,
                     txParams.data,
                   ),
               ).to.be.revertedWithCustomError(context.lsp7, 'LSP7CannotSendToSelf');
@@ -1150,14 +1138,14 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
           });
 
           describe('when `amount == 0`', () => {
-            it('should revert with `allowNonLSP1Recipient == false`', async () => {
+            it('should revert with `force == false`', async () => {
               const caller = context.accounts.anyone;
 
               const txParams = {
                 from: context.accounts.anyone.address,
                 to: context.accounts.anotherTokenReceiver.address,
                 amount: ethers.BigNumber.from(0),
-                allowNonLSP1Recipient: false,
+                force: false,
                 data: '0x',
               };
 
@@ -1168,7 +1156,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                     txParams.from,
                     txParams.to,
                     txParams.amount,
-                    txParams.allowNonLSP1Recipient,
+                    txParams.force,
                     txParams.data,
                   ),
               )
@@ -1176,14 +1164,14 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                 .withArgs(txParams.to);
             });
 
-            it('should pass with `allowNonLSP1Recipient == true`', async () => {
+            it('should pass with `force == true`', async () => {
               const caller = context.accounts.anyone;
 
               const txParams = {
                 from: context.accounts.anyone.address,
                 to: context.accounts.anotherTokenReceiver.address,
                 amount: ethers.BigNumber.from(0),
-                allowNonLSP1Recipient: true,
+                force: true,
                 data: '0x',
               };
 
@@ -1198,7 +1186,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                 from: context.accounts.owner.address,
                 to: helperContracts.tokenReceiverWithoutLSP1.address,
                 amount: context.initialSupply,
-                allowNonLSP1Recipient: true,
+                force: true,
                 data: '0x',
               };
               const operatorAmount = await context.lsp7.authorizedAmountFor(
@@ -1213,7 +1201,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                     txParams.from,
                     txParams.to,
                     txParams.amount,
-                    txParams.allowNonLSP1Recipient,
+                    txParams.force,
                     txParams.data,
                   ),
               )
@@ -1235,7 +1223,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
               from: context.accounts.owner.address,
               to: context.accounts.tokenReceiver.address,
               amount: context.initialSupply,
-              allowNonLSP1Recipient: true,
+              force: true,
               data: '0x',
             };
             const operatorAmount = await context.lsp7.authorizedAmountFor(
@@ -1256,7 +1244,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                   txParams.from,
                   txParams.to,
                   txParams.amount,
-                  txParams.allowNonLSP1Recipient,
+                  txParams.force,
                   txParams.data,
                 ),
             )
@@ -1290,12 +1278,12 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
           from: string[];
           to: string[];
           amount: BigNumber[];
-          allowNonLSP1Recipient: boolean[];
+          force: boolean[];
           data: string[];
         };
 
         const transferBatchSuccessScenario = async (
-          { from, to, amount, allowNonLSP1Recipient, data }: TransferBatchTxParams,
+          { from, to, amount, force, data }: TransferBatchTxParams,
           operator: SignerWithAddress,
         ) => {
           // pre-conditions
@@ -1309,7 +1297,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
           // effect
           const tx = await context.lsp7
             .connect(operator)
-            .transferBatch(from, to, amount, allowNonLSP1Recipient, data);
+            .transferBatch(from, to, amount, force, data);
 
           await Promise.all(
             amount.map(async (_, index) => {
@@ -1320,7 +1308,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                   from[index],
                   to[index],
                   amount[index],
-                  allowNonLSP1Recipient[index],
+                  force[index],
                   data[index],
                 );
             }),
@@ -1361,23 +1349,19 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
         };
 
         const transferBatchFailScenario = async (
-          { from, to, amount, allowNonLSP1Recipient, data }: TransferBatchTxParams,
+          { from, to, amount, force, data }: TransferBatchTxParams,
           operator: SignerWithAddress,
           expectedError: ExpectedError,
         ) => {
           if (expectedError.args.length > 0)
             await expect(
-              context.lsp7
-                .connect(operator)
-                .transferBatch(from, to, amount, allowNonLSP1Recipient, data),
+              context.lsp7.connect(operator).transferBatch(from, to, amount, force, data),
             )
               .to.be.revertedWithCustomError(context.lsp7, expectedError.error)
               .withArgs(...expectedError.args);
           else
             await expect(
-              context.lsp7
-                .connect(operator)
-                .transferBatch(from, to, amount, allowNonLSP1Recipient, data),
+              context.lsp7.connect(operator).transferBatch(from, to, amount, force, data),
             ).to.be.revertedWithCustomError(context.lsp7, expectedError.error);
         };
 
@@ -1388,9 +1372,9 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
             operator = getOperator();
           });
 
-          describe('when allowNonLSP1Recipient=true', () => {
+          describe('when force=true', () => {
             const data = ethers.utils.hexlify(
-              ethers.utils.toUtf8Bytes('doing a transfer with allowNonLSP1Recipient'),
+              ethers.utils.toUtf8Bytes('doing a transfer with force'),
             );
 
             describe('when `to` is an EOA', () => {
@@ -1400,7 +1384,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                     from: [context.accounts.owner.address, context.accounts.owner.address],
                     to: [context.accounts.tokenReceiver.address, ethers.constants.AddressZero],
                     amount: [context.initialSupply.sub(1), ethers.BigNumber.from('1')],
-                    allowNonLSP1Recipient: [true, true],
+                    force: [true, true],
                     data: [data, data],
                   };
                   const expectedError = 'LSP7CannotSendWithAddressZero';
@@ -1421,7 +1405,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                       context.accounts.anotherTokenReceiver.address,
                     ],
                     amount: [context.initialSupply.sub(1), ethers.BigNumber.from('1')],
-                    allowNonLSP1Recipient: [true, true],
+                    force: [true, true],
                     data: [data, data],
                   };
 
@@ -1440,7 +1424,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                       helperContracts.tokenReceiverWithLSP1.address,
                     ],
                     amount: [context.initialSupply.sub(1), ethers.BigNumber.from('1')],
-                    allowNonLSP1Recipient: [true, true],
+                    force: [true, true],
                     data: [data, data],
                   };
 
@@ -1477,7 +1461,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                       helperContracts.tokenReceiverWithoutLSP1.address,
                     ],
                     amount: [context.initialSupply.sub(1), ethers.BigNumber.from('1')],
-                    allowNonLSP1Recipient: [true, true],
+                    force: [true, true],
                     data: [data, data],
                   };
 
@@ -1487,9 +1471,9 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
             });
           });
 
-          describe('when allowNonLSP1Recipient=false', () => {
+          describe('when force=false', () => {
             const data = ethers.utils.hexlify(
-              ethers.utils.toUtf8Bytes('doing a transfer without allowNonLSP1Recipient'),
+              ethers.utils.toUtf8Bytes('doing a transfer without force'),
             );
 
             describe('when `to` is an EOA', () => {
@@ -1501,7 +1485,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                     context.accounts.anotherTokenReceiver.address,
                   ],
                   amount: [context.initialSupply.sub(1), ethers.BigNumber.from('1')],
-                  allowNonLSP1Recipient: [false, false],
+                  force: [false, false],
                   data: [data, data],
                 };
                 const expectedError = 'LSP7NotifyTokenReceiverIsEOA';
@@ -1523,7 +1507,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                       helperContracts.tokenReceiverWithLSP1.address,
                     ],
                     amount: [context.initialSupply.sub(1), ethers.BigNumber.from('1')],
-                    allowNonLSP1Recipient: [false, false],
+                    force: [false, false],
                     data: [data, data],
                   };
 
@@ -1540,7 +1524,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                       helperContracts.tokenReceiverWithoutLSP1.address,
                     ],
                     amount: [context.initialSupply.sub(1), ethers.BigNumber.from('1')],
-                    allowNonLSP1Recipient: [false, false],
+                    force: [false, false],
                     data: [data, data],
                   };
                   const expectedError = 'LSP7NotifyTokenReceiverContractMissingLSP1Interface';
@@ -1554,9 +1538,9 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
             });
           });
 
-          describe('when allowNonLSP1Recipient is mixed(true/false) respectively', () => {
+          describe('when force is mixed(true/false) respectively', () => {
             const data = ethers.utils.hexlify(
-              ethers.utils.toUtf8Bytes('doing a transfer without allowNonLSP1Recipient'),
+              ethers.utils.toUtf8Bytes('doing a transfer without force'),
             );
 
             describe('when `to` is an EOA', () => {
@@ -1568,7 +1552,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                     context.accounts.anotherTokenReceiver.address,
                   ],
                   amount: [context.initialSupply.sub(1), ethers.BigNumber.from('1')],
-                  allowNonLSP1Recipient: [true, false],
+                  force: [true, false],
                   data: [data, data],
                 };
                 const expectedError = 'LSP7NotifyTokenReceiverIsEOA';
@@ -1590,7 +1574,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                       helperContracts.tokenReceiverWithoutLSP1.address,
                     ],
                     amount: [context.initialSupply.sub(1), ethers.BigNumber.from('1')],
-                    allowNonLSP1Recipient: [true, false],
+                    force: [true, false],
                     data: [data, data],
                   };
 
@@ -1604,7 +1588,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
               });
 
               describe('when receiving contract both support LSP1', () => {
-                it('should pass regardless of allowNonLSP1Recipient params', async () => {
+                it('should pass regardless of force params', async () => {
                   const txParams = {
                     from: [context.accounts.owner.address, context.accounts.owner.address],
                     to: [
@@ -1612,7 +1596,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                       helperContracts.tokenReceiverWithLSP1.address,
                     ],
                     amount: [context.initialSupply.sub(1), ethers.BigNumber.from('1')],
-                    allowNonLSP1Recipient: [true, false],
+                    force: [true, false],
                     data: [data, data],
                   };
 
@@ -1628,7 +1612,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                 from: [context.accounts.owner.address],
                 to: [context.accounts.tokenReceiver.address],
                 amount: [context.initialSupply.add(1)],
-                allowNonLSP1Recipient: [true],
+                force: [true],
                 data: ['0x'],
               };
               const expectedError = 'LSP7AmountExceedsBalance';
@@ -1661,7 +1645,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                   context.accounts.tokenReceiver.address,
                 ],
                 amount: [context.initialSupply.sub(1), ethers.BigNumber.from('1')],
-                allowNonLSP1Recipient: [true, true],
+                force: [true, true],
                 data: ['0x', '0x'],
               };
 
@@ -1698,7 +1682,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                 from: [context.accounts.owner.address, context.accounts.owner.address],
                 to: [context.accounts.tokenReceiver.address, context.accounts.owner.address],
                 amount: [context.initialSupply.sub(1), ethers.BigNumber.from('1')],
-                allowNonLSP1Recipient: [true, true],
+                force: [true, true],
                 data: ['0x', '0x'],
               };
               const expectedError = 'LSP7CannotSendToSelf';
@@ -1717,7 +1701,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                 from: [context.accounts.owner.address],
                 to: [context.accounts.tokenReceiver.address],
                 amount: [context.initialSupply],
-                allowNonLSP1Recipient: [true],
+                force: [true],
                 data: ['0x'],
               };
               const expectedError = 'LSP7AmountExceedsAuthorizedAmount';
@@ -1745,7 +1729,7 @@ export const shouldBehaveLikeLSP7 = (buildContext: () => Promise<LSP7TestContext
                 from: [context.accounts.owner.address],
                 to: [context.accounts.tokenReceiver.address],
                 amount: [context.initialSupply],
-                allowNonLSP1Recipient: [true],
+                force: [true],
                 data: ['0x'],
               };
               const expectedError = 'LSP7AmountExceedsAuthorizedAmount';
diff --git a/tests/LSP7DigitalAsset/LSP7Mintable.behaviour.ts b/tests/LSP7DigitalAsset/LSP7Mintable.behaviour.ts
index bdb94bb58..43d0f2dbf 100644
--- a/tests/LSP7DigitalAsset/LSP7Mintable.behaviour.ts
+++ b/tests/LSP7DigitalAsset/LSP7Mintable.behaviour.ts
@@ -54,7 +54,7 @@ export const shouldBehaveLikeLSP7Mintable = (
       await context.lsp7Mintable.mint(
         context.accounts.tokenReceiver.address,
         amountToMint,
-        true, // beneficiary is an EOA, so we need to allowNonLSP1Recipient minting
+        true, // beneficiary is an EOA, so we need to force minting
         '0x',
       );
 
diff --git a/tests/LSP8IdentifiableDigitalAsset/LSP8CompatibleERC721.behaviour.ts b/tests/LSP8IdentifiableDigitalAsset/LSP8CompatibleERC721.behaviour.ts
index c2eb483e5..475c4b315 100644
--- a/tests/LSP8IdentifiableDigitalAsset/LSP8CompatibleERC721.behaviour.ts
+++ b/tests/LSP8IdentifiableDigitalAsset/LSP8CompatibleERC721.behaviour.ts
@@ -731,7 +731,7 @@ export const shouldBehaveLikeLSP8CompatibleERC721 = (
     const transferSuccessScenario = async (
       { operator, from, to, tokenId, data }: TransferTxParams,
       transferFn: string,
-      allowNonLSP1Recipient: boolean,
+      force: boolean,
       expectedData: string,
     ) => {
       // pre-conditions
@@ -749,14 +749,7 @@ export const shouldBehaveLikeLSP8CompatibleERC721 = (
           context.lsp8CompatibleERC721,
           'Transfer(address,address,address,bytes32,bool,bytes)',
         )
-        .withArgs(
-          operator,
-          from,
-          to,
-          tokenIdAsBytes32(tokenId),
-          allowNonLSP1Recipient,
-          expectedData,
-        );
+        .withArgs(operator, from, to, tokenIdAsBytes32(tokenId), force, expectedData);
 
       await expect(tx)
         .to.emit(context.lsp8CompatibleERC721, 'Transfer(address,address,uint256)')
@@ -773,7 +766,7 @@ export const shouldBehaveLikeLSP8CompatibleERC721 = (
 
     describe('transferFrom', () => {
       const transferFn = 'transferFrom';
-      const allowNonLSP1Recipient = true;
+      const force = true;
       const expectedData = ethers.utils.hexlify(ethers.utils.toUtf8Bytes(''));
 
       describe('when the from address is the tokenId owner', () => {
@@ -786,12 +779,7 @@ export const shouldBehaveLikeLSP8CompatibleERC721 = (
               tokenId: mintedTokenId,
             };
 
-            await transferSuccessScenario(
-              txParams,
-              transferFn,
-              allowNonLSP1Recipient,
-              expectedData,
-            );
+            await transferSuccessScenario(txParams, transferFn, force, expectedData);
           });
         });
 
@@ -805,12 +793,7 @@ export const shouldBehaveLikeLSP8CompatibleERC721 = (
                 tokenId: mintedTokenId,
               };
 
-              await transferSuccessScenario(
-                txParams,
-                transferFn,
-                allowNonLSP1Recipient,
-                expectedData,
-              );
+              await transferSuccessScenario(txParams, transferFn, force, expectedData);
             });
           });
 
@@ -823,12 +806,7 @@ export const shouldBehaveLikeLSP8CompatibleERC721 = (
                 tokenId: mintedTokenId,
               };
 
-              await transferSuccessScenario(
-                txParams,
-                transferFn,
-                allowNonLSP1Recipient,
-                expectedData,
-              );
+              await transferSuccessScenario(txParams, transferFn, force, expectedData);
             });
           });
         });
diff --git a/tests/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.behaviour.ts b/tests/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.behaviour.ts
index 05be3dd17..ecf3bb2f1 100644
--- a/tests/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.behaviour.ts
+++ b/tests/LSP8IdentifiableDigitalAsset/LSP8IdentifiableDigitalAsset.behaviour.ts
@@ -83,17 +83,12 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
         const txParams = {
           to: context.accounts.tokenReceiver.address,
           tokenId: mintedTokenId,
-          allowNonLSP1Recipient: true,
+          force: true,
           data: '0x',
         };
 
         await expect(
-          context.lsp8.mint(
-            txParams.to,
-            txParams.tokenId,
-            txParams.allowNonLSP1Recipient,
-            txParams.data,
-          ),
+          context.lsp8.mint(txParams.to, txParams.tokenId, txParams.force, txParams.data),
         )
           .to.be.revertedWithCustomError(context.lsp8, 'LSP8TokenIdAlreadyMinted')
           .withArgs(txParams.tokenId);
@@ -108,17 +103,12 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
           const txParams = {
             to: ethers.constants.AddressZero,
             tokenId: toBeMintedTokenId,
-            allowNonLSP1Recipient: true,
+            force: true,
             data: '0x',
           };
 
           await expect(
-            context.lsp8.mint(
-              txParams.to,
-              txParams.tokenId,
-              txParams.allowNonLSP1Recipient,
-              txParams.data,
-            ),
+            context.lsp8.mint(txParams.to, txParams.tokenId, txParams.force, txParams.data),
           ).to.be.revertedWithCustomError(context.lsp8, 'LSP8CannotSendToAddressZero');
         });
       });
@@ -128,16 +118,11 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
           const txParams = {
             to: context.accounts.tokenReceiver.address,
             tokenId: toBeMintedTokenId,
-            allowNonLSP1Recipient: true,
+            force: true,
             data: ethers.utils.toUtf8Bytes('we need more tokens'),
           };
 
-          await context.lsp8.mint(
-            txParams.to,
-            txParams.tokenId,
-            txParams.allowNonLSP1Recipient,
-            txParams.data,
-          );
+          await context.lsp8.mint(txParams.to, txParams.tokenId, txParams.force, txParams.data);
 
           const tokenOwnerOf = await context.lsp8.tokenOwnerOf(txParams.tokenId);
           expect(tokenOwnerOf).to.equal(txParams.to);
@@ -664,12 +649,12 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
         from: string;
         to: string;
         tokenId: BytesLike;
-        allowNonLSP1Recipient: boolean;
+        force: boolean;
         data: string;
       };
 
       const transferSuccessScenario = async (
-        { from, to, tokenId, allowNonLSP1Recipient, data }: TransferTxParams,
+        { from, to, tokenId, force, data }: TransferTxParams,
         operator: SignerWithAddress,
       ) => {
         // pre-conditions
@@ -692,12 +677,10 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
         const preToBalanceOf = await context.lsp8.balanceOf(to);
 
         // effect
-        const tx = await context.lsp8
-          .connect(operator)
-          .transfer(from, to, tokenId, allowNonLSP1Recipient, data);
+        const tx = await context.lsp8.connect(operator).transfer(from, to, tokenId, force, data);
         await expect(tx)
           .to.emit(context.lsp8, 'Transfer')
-          .withArgs(operator.address, from, to, tokenId, allowNonLSP1Recipient, data);
+          .withArgs(operator.address, from, to, tokenId, force, data);
 
         await expect(tx)
           .to.emit(context.lsp8, 'RevokedOperator')
@@ -737,10 +720,10 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
           operator = getOperator();
         });
 
-        describe('when using allowNonLSP1Recipient=true', () => {
-          const allowNonLSP1Recipient = true;
+        describe('when using force=true', () => {
+          const force = true;
           const data = ethers.utils.hexlify(
-            ethers.utils.toUtf8Bytes('doing a transfer with allowNonLSP1Recipient'),
+            ethers.utils.toUtf8Bytes('doing a transfer with force'),
           );
 
           describe('when `to` is an EOA', () => {
@@ -750,7 +733,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                   from: context.accounts.owner.address,
                   to: ethers.constants.AddressZero,
                   tokenId: mintedTokenId,
-                  allowNonLSP1Recipient,
+                  force,
                   data,
                 };
 
@@ -761,7 +744,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                       txParams.from,
                       txParams.to,
                       txParams.tokenId,
-                      txParams.allowNonLSP1Recipient,
+                      txParams.force,
                       txParams.data,
                     ),
                 ).to.be.revertedWithCustomError(context.lsp8, 'LSP8CannotSendToAddressZero');
@@ -773,7 +756,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                 from: context.accounts.owner.address,
                 to: context.accounts.tokenReceiver.address,
                 tokenId: mintedTokenId,
-                allowNonLSP1Recipient,
+                force,
                 data,
               };
 
@@ -789,7 +772,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                   from: context.accounts.owner.address,
                   to: helperContracts.tokenReceiverWithLSP1.address,
                   tokenId: mintedTokenId,
-                  allowNonLSP1Recipient,
+                  force,
                   data,
                 };
 
@@ -814,7 +797,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                   from: context.accounts.owner.address,
                   to: helperContracts.tokenReceiverWithoutLSP1.address,
                   tokenId: mintedTokenId,
-                  allowNonLSP1Recipient,
+                  force,
                   data,
                 };
 
@@ -829,7 +812,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                 from: context.accounts.owner.address,
                 to: context.accounts.owner.address,
                 tokenId: mintedTokenId,
-                allowNonLSP1Recipient,
+                force,
                 data,
               };
 
@@ -840,7 +823,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                     txParams.from,
                     txParams.to,
                     txParams.tokenId,
-                    txParams.allowNonLSP1Recipient,
+                    txParams.force,
                     txParams.data,
                   ),
               ).to.be.revertedWithCustomError(context.lsp8, 'LSP8CannotSendToSelf');
@@ -848,10 +831,10 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
           });
         });
 
-        describe('when allowNonLSP1Recipient=false', () => {
-          const allowNonLSP1Recipient = false;
+        describe('when force=false', () => {
+          const force = false;
           const data = ethers.utils.hexlify(
-            ethers.utils.toUtf8Bytes('doing a transfer without allowNonLSP1Recipient'),
+            ethers.utils.toUtf8Bytes('doing a transfer without force'),
           );
 
           describe('when `to` is an EOA', () => {
@@ -860,7 +843,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                 from: context.accounts.owner.address,
                 to: context.accounts.tokenReceiver.address,
                 tokenId: mintedTokenId,
-                allowNonLSP1Recipient,
+                force,
                 data,
               };
 
@@ -871,7 +854,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                     txParams.from,
                     txParams.to,
                     txParams.tokenId,
-                    txParams.allowNonLSP1Recipient,
+                    txParams.force,
                     txParams.data,
                   ),
               )
@@ -888,7 +871,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                   from: context.accounts.owner.address,
                   to: helperContracts.tokenReceiverWithLSP1.address,
                   tokenId: mintedTokenId,
-                  allowNonLSP1Recipient,
+                  force,
                   data,
                 };
 
@@ -913,7 +896,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                   from: context.accounts.owner.address,
                   to: helperContracts.tokenReceiverWithoutLSP1.address,
                   tokenId: mintedTokenId,
-                  allowNonLSP1Recipient,
+                  force,
                   data,
                 };
 
@@ -924,7 +907,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                       txParams.from,
                       txParams.to,
                       txParams.tokenId,
-                      txParams.allowNonLSP1Recipient,
+                      txParams.force,
                       txParams.data,
                     ),
                 )
@@ -943,7 +926,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                 from: context.accounts.owner.address,
                 to: context.accounts.owner.address,
                 tokenId: mintedTokenId,
-                allowNonLSP1Recipient,
+                force,
                 data,
               };
 
@@ -954,7 +937,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                     txParams.from,
                     txParams.to,
                     txParams.tokenId,
-                    txParams.allowNonLSP1Recipient,
+                    txParams.force,
                     txParams.data,
                   ),
               ).to.be.revertedWithCustomError(context.lsp8, 'LSP8CannotSendToSelf');
@@ -977,7 +960,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
               from: context.accounts.owner.address,
               to: context.accounts.tokenReceiver.address,
               tokenId: mintedTokenId,
-              allowNonLSP1Recipient: true,
+              force: true,
               data: '0x',
             };
 
@@ -988,7 +971,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                   txParams.from,
                   txParams.to,
                   txParams.tokenId,
-                  txParams.allowNonLSP1Recipient,
+                  txParams.force,
                   txParams.data,
                 ),
             )
@@ -1005,7 +988,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
             from: context.accounts.anyone.address,
             to: context.accounts.tokenReceiver.address,
             tokenId: mintedTokenId,
-            allowNonLSP1Recipient: true,
+            force: true,
             data: '0x',
           };
 
@@ -1016,7 +999,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                 txParams.from,
                 txParams.to,
                 txParams.tokenId,
-                txParams.allowNonLSP1Recipient,
+                txParams.force,
                 txParams.data,
               ),
           )
@@ -1032,7 +1015,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
             from: context.accounts.owner.address,
             to: context.accounts.tokenReceiver.address,
             tokenId: neverMintedTokenId,
-            allowNonLSP1Recipient: true,
+            force: true,
             data: '0x',
           };
 
@@ -1043,7 +1026,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                 txParams.from,
                 txParams.to,
                 txParams.tokenId,
-                txParams.allowNonLSP1Recipient,
+                txParams.force,
                 txParams.data,
               ),
           )
@@ -1082,12 +1065,12 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
         from: string[];
         to: string[];
         tokenId: BytesLike[];
-        allowNonLSP1Recipient: boolean[];
+        force: boolean[];
         data: string[];
       };
 
       const transferBatchSuccessScenario = async (
-        { from, to, tokenId, allowNonLSP1Recipient, data }: TransferBatchTxParams,
+        { from, to, tokenId, force, data }: TransferBatchTxParams,
         operator: SignerWithAddress,
       ) => {
         // pre-conditions
@@ -1107,7 +1090,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
         // effect
         const tx = await context.lsp8
           .connect(operator)
-          .transferBatch(from, to, tokenId, allowNonLSP1Recipient, data);
+          .transferBatch(from, to, tokenId, force, data);
 
         await Promise.all(
           tokenId.map(async (_, index) => {
@@ -1118,7 +1101,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                 from[index],
                 to[index],
                 tokenId[index],
-                allowNonLSP1Recipient[index],
+                force[index],
                 data[index],
               );
             await expect(tx)
@@ -1150,7 +1133,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
       };
 
       const transferBatchFailScenario = async (
-        { from, to, tokenId, allowNonLSP1Recipient, data }: TransferBatchTxParams,
+        { from, to, tokenId, force, data }: TransferBatchTxParams,
         operator: SignerWithAddress,
         expectedError: ExpectedError,
       ) => {
@@ -1164,18 +1147,12 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
 
         // effect
         if (expectedError.args.length > 0)
-          await expect(
-            context.lsp8
-              .connect(operator)
-              .transferBatch(from, to, tokenId, allowNonLSP1Recipient, data),
-          )
+          await expect(context.lsp8.connect(operator).transferBatch(from, to, tokenId, force, data))
             .to.be.revertedWithCustomError(context.lsp8, expectedError.error)
             .withArgs(...expectedError.args);
         else
           await expect(
-            context.lsp8
-              .connect(operator)
-              .transferBatch(from, to, tokenId, allowNonLSP1Recipient, data),
+            context.lsp8.connect(operator).transferBatch(from, to, tokenId, force, data),
           ).to.be.revertedWithCustomError(context.lsp8, expectedError.error);
       };
 
@@ -1186,9 +1163,9 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
           operator = getOperator();
         });
 
-        describe('when allowNonLSP1Recipient=true', () => {
+        describe('when force=true', () => {
           const data = ethers.utils.hexlify(
-            ethers.utils.toUtf8Bytes('doing a transfer with allowNonLSP1Recipient'),
+            ethers.utils.toUtf8Bytes('doing a transfer with force'),
           );
 
           describe('when `to` is an EOA', () => {
@@ -1198,7 +1175,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                   from: [context.accounts.owner.address, context.accounts.owner.address],
                   to: [context.accounts.tokenReceiver.address, ethers.constants.AddressZero],
                   tokenId: [mintedTokenId, anotherMintedTokenId],
-                  allowNonLSP1Recipient: [true, true],
+                  force: [true, true],
                   data: [data, data],
                 };
                 const expectedError = 'LSP8CannotSendToAddressZero';
@@ -1218,7 +1195,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                   context.accounts.tokenReceiver.address,
                 ],
                 tokenId: [mintedTokenId, anotherMintedTokenId],
-                allowNonLSP1Recipient: [true, true],
+                force: [true, true],
                 data: [data, data],
               };
 
@@ -1236,7 +1213,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                     helperContracts.tokenReceiverWithLSP1.address,
                   ],
                   tokenId: [mintedTokenId, anotherMintedTokenId],
-                  allowNonLSP1Recipient: [true, true],
+                  force: [true, true],
                   data: [data, data],
                 };
 
@@ -1273,7 +1250,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                     helperContracts.tokenReceiverWithoutLSP1.address,
                   ],
                   tokenId: [mintedTokenId, anotherMintedTokenId],
-                  allowNonLSP1Recipient: [true, true],
+                  force: [true, true],
                   data: [data, data],
                 };
 
@@ -1283,9 +1260,9 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
           });
         });
 
-        describe('when allowNonLSP1Recipient=false', () => {
+        describe('when force=false', () => {
           const data = ethers.utils.hexlify(
-            ethers.utils.toUtf8Bytes('doing a transfer without allowNonLSP1Recipient'),
+            ethers.utils.toUtf8Bytes('doing a transfer without force'),
           );
 
           describe('when `to` is an EOA', () => {
@@ -1297,7 +1274,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                   helperContracts.tokenReceiverWithLSP1.address,
                 ],
                 tokenId: [mintedTokenId, anotherMintedTokenId],
-                allowNonLSP1Recipient: [false, false],
+                force: [false, false],
                 data: [data, data],
               };
               const expectedError = 'LSP8NotifyTokenReceiverIsEOA';
@@ -1319,7 +1296,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                     helperContracts.tokenReceiverWithLSP1.address,
                   ],
                   tokenId: [mintedTokenId, anotherMintedTokenId],
-                  allowNonLSP1Recipient: [false, false],
+                  force: [false, false],
                   data: [data, data],
                 };
 
@@ -1336,7 +1313,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                     helperContracts.tokenReceiverWithLSP1.address,
                   ],
                   tokenId: [mintedTokenId, anotherMintedTokenId],
-                  allowNonLSP1Recipient: [false, false],
+                  force: [false, false],
                   data: [data, data],
                 };
                 const expectedError = 'LSP8NotifyTokenReceiverContractMissingLSP1Interface';
@@ -1350,9 +1327,9 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
           });
         });
 
-        describe('when allowNonLSP1Recipient is mixed(true/false) respectively', () => {
+        describe('when force is mixed(true/false) respectively', () => {
           const data = ethers.utils.hexlify(
-            ethers.utils.toUtf8Bytes('doing a transfer without allowNonLSP1Recipient'),
+            ethers.utils.toUtf8Bytes('doing a transfer without force'),
           );
 
           describe('when `to` is an EOA', () => {
@@ -1364,7 +1341,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                   context.accounts.tokenReceiver.address,
                 ],
                 tokenId: [mintedTokenId, anotherMintedTokenId],
-                allowNonLSP1Recipient: [true, false],
+                force: [true, false],
                 data: [data, data],
               };
               const expectedError = 'LSP8NotifyTokenReceiverIsEOA';
@@ -1386,7 +1363,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                     helperContracts.tokenReceiverWithoutLSP1.address,
                   ],
                   tokenId: [mintedTokenId, anotherMintedTokenId],
-                  allowNonLSP1Recipient: [true, false],
+                  force: [true, false],
                   data: [data, data],
                 };
 
@@ -1400,7 +1377,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
             });
 
             describe('when receiving contract both support LSP1', () => {
-              it('should pass regardless of allowNonLSP1Recipient params', async () => {
+              it('should pass regardless of force params', async () => {
                 const txParams = {
                   from: [context.accounts.owner.address, context.accounts.owner.address],
                   to: [
@@ -1408,7 +1385,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
                     helperContracts.tokenReceiverWithLSP1.address,
                   ],
                   tokenId: [mintedTokenId, anotherMintedTokenId],
-                  allowNonLSP1Recipient: [true, false],
+                  force: [true, false],
                   data: [data, data],
                 };
 
@@ -1424,7 +1401,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
               to: [context.accounts.anyone.address],
               from: [context.accounts.tokenReceiver.address],
               tokenId: [mintedTokenId],
-              allowNonLSP1Recipient: [true],
+              force: [true],
               data: ['0x'],
             };
             const expectedError = 'LSP8NotTokenOwner';
@@ -1446,7 +1423,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
               to: [context.accounts.anyone.address],
               from: [context.accounts.tokenReceiver.address],
               tokenId: [neverMintedTokenId],
-              allowNonLSP1Recipient: [true],
+              force: [true],
               data: ['0x'],
             };
             const expectedError = 'LSP8NonExistentTokenId';
@@ -1464,7 +1441,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
               from: [context.accounts.owner.address, context.accounts.owner.address],
               to: [context.accounts.tokenReceiver.address, context.accounts.tokenReceiver.address],
               tokenId: [mintedTokenId, anotherMintedTokenId],
-              allowNonLSP1Recipient: [true],
+              force: [true],
               data: ['0x', '0x'],
             };
 
@@ -1501,7 +1478,7 @@ export const shouldBehaveLikeLSP8 = (buildContext: () => Promise<LSP8TestContext
               to: [context.accounts.owner.address],
               from: [context.accounts.tokenReceiver.address],
               tokenId: [mintedTokenId],
-              allowNonLSP1Recipient: [true],
+              force: [true],
               data: ['0x'],
             };
             const expectedError = 'LSP8NotTokenOperator';
diff --git a/tests/LSP8IdentifiableDigitalAsset/LSP8Mintable.behaviour.ts b/tests/LSP8IdentifiableDigitalAsset/LSP8Mintable.behaviour.ts
index 0d5c5151a..8afb19708 100644
--- a/tests/LSP8IdentifiableDigitalAsset/LSP8Mintable.behaviour.ts
+++ b/tests/LSP8IdentifiableDigitalAsset/LSP8Mintable.behaviour.ts
@@ -54,7 +54,7 @@ export const shouldBehaveLikeLSP8Mintable = (
       await context.lsp8Mintable.mint(
         context.accounts.tokenReceiver.address,
         randomTokenId,
-        true, // beneficiary is an EOA, so we need to allowNonLSP1Recipient minting
+        true, // beneficiary is an EOA, so we need to force minting
         '0x',
       );