diff --git a/test/avalanche/swap/swap-test.ts b/test/avalanche/swap/swap-test.ts
index 8dc4efb0..e1aee935 100644
--- a/test/avalanche/swap/swap-test.ts
+++ b/test/avalanche/swap/swap-test.ts
@@ -146,36 +146,18 @@ describe("Swap | Avalanche", function () {
         let unitAmt0x = calculateUnitAmt(buyTokenAmountZeroX);
         let unitAmtParaswap = calculateUnitAmt(buyTokenAmountParaswap);
 
-        function getSelector(connector: string, unitAmt: any, callData: any) {
+        function getCallData(connector: string, unitAmt: any, callData: any) {
           var abi = [
             "function swap(address,address,uint256,uint256,bytes,uint256)",
             "function sell(address,address,uint256,uint256,bytes,uint256)"
           ];
           var iface = new ethers.utils.Interface(abi);
-          var data;
-          if (connector == "1INCH-A") {
-            data = iface.encodeFunctionData("sell", [
-              buyTokenAddress,
-              sellTokenAddress,
-              srcAmount,
-              unitAmt,
-              callData,
-              0
-            ]);
-          } else {
-            data = iface.encodeFunctionData("swap", [
-              buyTokenAddress,
-              sellTokenAddress,
-              srcAmount,
-              unitAmt,
-              callData,
-              0
-            ]);
-          }
+          const spell = connector === "1INCH-A" ? "sell" : "swap";
+          let data = iface.encodeFunctionData(spell, [buyTokenAddress, sellTokenAddress, srcAmount, unitAmt, callData, 0]);
           return data;
         }
-        let dataPara = ethers.utils.hexlify(await getSelector("PARASWAP-A", unitAmtParaswap, calldataPara));
-        let dataZeroX = ethers.utils.hexlify(await getSelector("ZEROX-A", unitAmt0x, calldataZeroX));
+        let dataPara = ethers.utils.hexlify(await getCallData("PARASWAP-A", unitAmtParaswap, calldataPara));
+        let dataZeroX = ethers.utils.hexlify(await getCallData("ZEROX-A", unitAmt0x, calldataZeroX));
         let datas = [dataPara, dataZeroX];
 
         let connectors = ["PARASWAP-A", "ZEROX-A"];
diff --git a/test/mainnet/swap/swap-test.ts b/test/mainnet/swap/swap-test.ts
index 69d4dad4..b7f38fd3 100644
--- a/test/mainnet/swap/swap-test.ts
+++ b/test/mainnet/swap/swap-test.ts
@@ -162,37 +162,19 @@ describe("Swap | Mainnet", function () {
         let unitAmt0x = calculateUnitAmt(buyTokenAmountZeroX);
         let unitAmtParaswap = calculateUnitAmt(buyTokenAmountParaswap);
 
-        function getSelector(connector: string, unitAmt: any, callData: any) {
+        function getCallData(connector: string, unitAmt: any, callData: any) {
           var abi = [
             "function swap(address,address,uint256,uint256,bytes,uint256)",
             "function sell(address,address,uint256,uint256,bytes,uint256)"
           ];
           var iface = new ethers.utils.Interface(abi);
-          var data;
-          if (connector == "1INCH-A") {
-            data = iface.encodeFunctionData("sell", [
-              buyTokenAddress,
-              sellTokenAddress,
-              srcAmount,
-              unitAmt,
-              callData,
-              0
-            ]);
-          } else {
-            data = iface.encodeFunctionData("swap", [
-              buyTokenAddress,
-              sellTokenAddress,
-              srcAmount,
-              unitAmt,
-              callData,
-              0
-            ]);
-          }
+          const spell = connector === "1INCH-A" ? "sell" : "swap";
+          let data = iface.encodeFunctionData(spell, [buyTokenAddress, sellTokenAddress, srcAmount, unitAmt, callData, 0]);
           return data;
         }
-        let data1Inch = ethers.utils.hexlify(await getSelector("1INCH-A", unitAmt1Inch, calldata1Inch));
-        let dataPara = ethers.utils.hexlify(await getSelector("PARASWAP-A", unitAmtParaswap, calldataPara));
-        let dataZeroX = ethers.utils.hexlify(await getSelector("ZEROX-A", unitAmt0x, calldataZeroX));
+        let data1Inch = ethers.utils.hexlify(await getCallData("1INCH-A", unitAmt1Inch, calldata1Inch));
+        let dataPara = ethers.utils.hexlify(await getCallData("PARASWAP-A", unitAmtParaswap, calldataPara));
+        let dataZeroX = ethers.utils.hexlify(await getCallData("ZEROX-A", unitAmt0x, calldataZeroX));
         let datas = [data1Inch, dataPara, dataZeroX];
 
         let connectors = ["1INCH-A", "PARASWAP-A", "ZEROX-A"];
diff --git a/test/polygon/swap/swap-test.ts b/test/polygon/swap/swap-test.ts
index 2b54e70a..0e7cb9a3 100644
--- a/test/polygon/swap/swap-test.ts
+++ b/test/polygon/swap/swap-test.ts
@@ -167,26 +167,8 @@ describe("Swap", function () {
             "function sell(address,address,uint256,uint256,bytes,uint256)"
           ];
           var iface = new ethers.utils.Interface(abi);
-          var data;
-          if (connector == "1INCH-A") {
-            data = iface.encodeFunctionData("sell", [
-              buyTokenAddress,
-              sellTokenAddress,
-              srcAmount,
-              unitAmt,
-              callData,
-              0
-            ]);
-          } else {
-            data = iface.encodeFunctionData("swap", [
-              buyTokenAddress,
-              sellTokenAddress,
-              srcAmount,
-              unitAmt,
-              callData,
-              0
-            ]);
-          }
+          const spell = connector === "1INCH-A" ? "sell" : "swap";
+          let data = iface.encodeFunctionData(spell, [buyTokenAddress, sellTokenAddress, srcAmount, unitAmt, callData, 0]);
           return data;
         }
         let dataPara = ethers.utils.hexlify(await getCallData("PARASWAP-A", unitAmtParaswap, calldataPara));