diff --git a/lib/tests/call_receive_header.js b/lib/tests/call_receive_header.js
index b808ac5d..6bcff0c0 100644
--- a/lib/tests/call_receive_header.js
+++ b/lib/tests/call_receive_header.js
@@ -10,7 +10,7 @@ let btcTxHelper;
 let bridge;
 
 const HEADER_RECEIVED_OK = 0;
-const RECEIVE_HEADER_CALLED_TOO_SOON = "-1";
+const RECEIVE_HEADER_CALLED_TOO_SOON = -1;
 
 const fulfillRequirementsToRunAsSingleTestFile = async () => {
     const forkName = process.env.FORK_NAME || getLatestForkName().name;
@@ -52,7 +52,7 @@ const execute = (description, getRskHost) => {
             const blockHashes = await btcTxHelper.mine();
             const blockHeader = await btcTxHelper.getBlockHeader(blockHashes[0], false);
             const result = await bridge.methods.receiveHeader(ensure0x(blockHeader)).call();
-            expect(result).to.be.equal(RECEIVE_HEADER_CALLED_TOO_SOON);
+            expect(Number(result)).to.be.equal(RECEIVE_HEADER_CALLED_TOO_SOON);
             }
         );
     });
diff --git a/tests/03_00_01-last_fork_active_powpeg_redeem_script.js b/tests/03_00_01-powpeg_redeem_script.js
similarity index 100%
rename from tests/03_00_01-last_fork_active_powpeg_redeem_script.js
rename to tests/03_00_01-powpeg_redeem_script.js
diff --git a/tests/03_00_02-last_fork_active_call_receive_headers.js b/tests/03_00_02-call_receive_headers.js
similarity index 100%
rename from tests/03_00_02-last_fork_active_call_receive_headers.js
rename to tests/03_00_02-call_receive_headers.js
diff --git a/tests/03_00_03-last_fork_active_call_receive_header.js b/tests/03_00_03-call_receive_header.js
similarity index 100%
rename from tests/03_00_03-last_fork_active_call_receive_header.js
rename to tests/03_00_03-call_receive_header.js
diff --git a/tests/05_00_01-last_fork_active_powpeg_redeem_script.js b/tests/05_00_01-powpeg_redeem_script.js
similarity index 100%
rename from tests/05_00_01-last_fork_active_powpeg_redeem_script.js
rename to tests/05_00_01-powpeg_redeem_script.js
diff --git a/tests/05_00_02-last_fork_active_call_receive_headers.js b/tests/05_00_02-call_receive_headers.js
similarity index 100%
rename from tests/05_00_02-last_fork_active_call_receive_headers.js
rename to tests/05_00_02-call_receive_headers.js
diff --git a/tests/05_00_03-last_fork_active_call_receive_header.js b/tests/05_00_03-call_receive_header.js
similarity index 100%
rename from tests/05_00_03-last_fork_active_call_receive_header.js
rename to tests/05_00_03-call_receive_header.js