diff --git a/.gas-snapshot b/.gas-snapshot
index 67c15aa..328bb8c 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -1,41 +1,33 @@
-TestStableTokenTest:test__CannotAddAlreadyMinterRole() (gas: 46264)
-TestStableTokenTest:test__CannotMintExceedingMaxSupply() (gas: 26180)
-TestStableTokenTest:test__CannotMintWithETHExceedingMaxSupply() (gas: 31142)
-TestStableTokenTest:test__CannotMintWithZeroETH() (gas: 18260)
-TestStableTokenTest:test__CannotRemoveNonMinterRole() (gas: 22680)
-TestStableTokenTest:test__CannotSetMaxSupplyBelowTotalSupply() (gas: 71137)
-TestStableTokenTest:test__CheckMinterRoleMapping() (gas: 70674)
-TestStableTokenTest:test__ContractDoesNotHoldETHAfterMint() (gas: 110678)
-TestStableTokenTest:test__ERC20BasicFunctionality() (gas: 146284)
-TestStableTokenTest:test__ETHBurnedEventEmitted() (gas: 112562)
-TestStableTokenTest:test__ETHIsBurnedToZeroAddress() (gas: 110523)
-TestStableTokenTest:test__InitializeZeroReverts() (gas: 2549161)
-TestStableTokenTest:test__MaxSupplyIsSetCorrectly() (gas: 15387)
-TestStableTokenTest:test__MintRequiresETH() (gas: 18298)
-TestStableTokenTest:test__MintWithDifferentETHAmounts() (gas: 209650)
-TestStableTokenTest:test__MinterAddedEventEmitted() (gas: 44969)
-TestStableTokenTest:test__MinterRemovedEventEmitted() (gas: 34680)
-TestStableTokenTest:test__MinterRoleCanMint() (gas: 98049)
-TestStableTokenTest:test__MultipleMinterRolesCanMint() (gas: 128712)
-TestStableTokenTest:test__NonMinterNonOwnerAccountCannotMint() (gas: 22487)
-TestStableTokenTest:test__NonOwnerCannotAddMinterRole() (gas: 18283)
-TestStableTokenTest:test__NonOwnerCannotRemoveMinterRole() (gas: 45753)
-TestStableTokenTest:test__NonOwnerCannotSetMaxSupply() (gas: 18048)
-TestStableTokenTest:test__OwnerCanAddMinterRole() (gas: 47314)
-TestStableTokenTest:test__OwnerCanMintWithoutMinterRole() (gas: 74339)
-TestStableTokenTest:test__OwnerCanRemoveMinterRole() (gas: 36526)
-TestStableTokenTest:test__OwnerCanSetMaxSupply() (gas: 30706)
-TestStableTokenTest:test__RemovedMinterRoleCannotMint() (gas: 37104)
-WakuRlnV2Test:testFuzz_Erasure(bool,uint8) (runs: 1000, μ: 984656, ~: 982425)
-WakuRlnV2Test:testFuzz_GetMerkleProof(uint32) (runs: 1002, μ: 4104507, ~: 3989323)
-WakuRlnV2Test:testFuzz_GetRateCommitmentsRange(uint32,uint32) (runs: 1002, μ: 3669568, ~: 3667740)
-WakuRlnV2Test:testFuzz_InvalidExtension(uint256,address,uint256) (runs: 1000, μ: 316358, ~: 316689)
-WakuRlnV2Test:testFuzz_MerkleErasures(uint8,bool) (runs: 1001, μ: 3676081, ~: 2201167)
-WakuRlnV2Test:testFuzz_MerkleInserts(uint8) (runs: 1001, μ: 3817908, ~: 2690272)
-WakuRlnV2Test:testFuzz_MultipleRegisters(uint8) (runs: 1002, μ: 6076714, ~: 3291327)
-WakuRlnV2Test:testFuzz_RegisterInvalid(uint256,uint32) (runs: 1000, μ: 60856, ~: 61711)
-WakuRlnV2Test:testFuzz_SetActiveDuration(uint32,bool) (runs: 1000, μ: 299053, ~: 312991)
-WakuRlnV2Test:testFuzz_SetMaxTotalRateLimit(uint32,bool) (runs: 1000, μ: 420447, ~: 313914)
+TestStableTokenTest:test__CannotAddAlreadyMinterRole() (gas: 46248)
+TestStableTokenTest:test__CannotMintExceedingMaxSupply() (gas: 26253)
+TestStableTokenTest:test__CannotMintWithETHExceedingMaxSupply() (gas: 31196)
+TestStableTokenTest:test__CannotMintWithZeroETH() (gas: 18269)
+TestStableTokenTest:test__CannotRemoveNonMinterRole() (gas: 22686)
+TestStableTokenTest:test__CannotSetMaxSupplyBelowTotalSupply() (gas: 71121)
+TestStableTokenTest:test__CheckMinterRoleMapping() (gas: 70476)
+TestStableTokenTest:test__ContractDoesNotHoldETHAfterMint() (gas: 110659)
+TestStableTokenTest:test__ERC20BasicFunctionality() (gas: 146438)
+TestStableTokenTest:test__ETHBurnedEventEmitted() (gas: 112577)
+TestStableTokenTest:test__ETHIsBurnedToZeroAddress() (gas: 110526)
+TestStableTokenTest:test__InitializeZeroReverts() (gas: 2558591)
+TestStableTokenTest:test__MaxSupplyIsSetCorrectly() (gas: 15454)
+TestStableTokenTest:test__MintRequiresETH() (gas: 18285)
+TestStableTokenTest:test__MintWithDifferentETHAmounts() (gas: 209788)
+TestStableTokenTest:test__MintWithETH_RevertsBelowOneETH() (gas: 25455)
+TestStableTokenTest:test__MintWithETH_SucceedsAtOneETH() (gas: 110063)
+TestStableTokenTest:test__MinterAddedEventEmitted() (gas: 44947)
+TestStableTokenTest:test__MinterRemovedEventEmitted() (gas: 34662)
+TestStableTokenTest:test__MinterRoleCanMint() (gas: 98092)
+TestStableTokenTest:test__MultipleMinterRolesCanMint() (gas: 128755)
+TestStableTokenTest:test__NonMinterNonOwnerAccountCannotMint() (gas: 22493)
+TestStableTokenTest:test__NonOwnerCannotAddMinterRole() (gas: 18223)
+TestStableTokenTest:test__NonOwnerCannotRemoveMinterRole() (gas: 45737)
+TestStableTokenTest:test__NonOwnerCannotSetMaxSupply() (gas: 18054)
+TestStableTokenTest:test__OwnerCanAddMinterRole() (gas: 47248)
+TestStableTokenTest:test__OwnerCanMintWithoutMinterRole() (gas: 74382)
+TestStableTokenTest:test__OwnerCanRemoveMinterRole() (gas: 36473)
+TestStableTokenTest:test__OwnerCanSetMaxSupply() (gas: 30795)
+TestStableTokenTest:test__RemovedMinterRoleCannotMint() (gas: 37073)
 WakuRlnV2Test:test__EmptyRangePagination() (gas: 307693)
 WakuRlnV2Test:test__ErasingNonExistentMembership() (gas: 46131)
 WakuRlnV2Test:test__FullCleanUpErasure() (gas: 1016790)
@@ -51,31 +43,31 @@ WakuRlnV2Test:test__InvalidRegistration__InvalidIdCommitment__Zero() (gas: 42830
 WakuRlnV2Test:test__InvalidRegistration__InvalidMembershipRateLimit__MinMax() (gas: 55598)
 WakuRlnV2Test:test__InvalidTokenAmount(uint256,uint32) (runs: 1000, μ: 191620, ~: 191620)
 WakuRlnV2Test:test__LargePaginationQuery() (gas: 237941853)
-WakuRlnV2Test:test__LinearPriceCalculation(uint32) (runs: 1002, μ: 26069, ~: 26069)
+WakuRlnV2Test:test__LinearPriceCalculation(uint32) (runs: 1000, μ: 26069, ~: 26069)
 WakuRlnV2Test:test__MassRegistrationAndErasure() (gas: 2714587)
 WakuRlnV2Test:test__MaxTotalRateLimitEdgeCases() (gas: 21832122)
 WakuRlnV2Test:test__MerkleTreeUpdateAfterErasureAndReuse() (gas: 2426716)
-WakuRlnV2Test:test__NonMinterCanMintWithETHAndRegister() (gas: 373178)
+WakuRlnV2Test:test__NonMinterCanMintWithETHAndRegister() (gas: 373332)
 WakuRlnV2Test:test__OwnerConfigurationUpdates() (gas: 53177)
-WakuRlnV2Test:test__PriceCalculatorReconfiguration() (gas: 669789)
+WakuRlnV2Test:test__PriceCalculatorReconfiguration() (gas: 669854)
 WakuRlnV2Test:test__RegistrationWhenMaxRateLimitIsReached() (gas: 595140)
 WakuRlnV2Test:test__ReinitializationProtection() (gas: 80197)
-WakuRlnV2Test:test__RemoveAllExpiredMemberships(uint32) (runs: 1001, μ: 5076387, ~: 2445573)
-WakuRlnV2Test:test__RemoveExpiredMemberships(uint32) (runs: 1001, μ: 1146896, ~: 1146896)
-WakuRlnV2Test:test__TokenTransferFailures() (gas: 4126462)
+WakuRlnV2Test:test__RemoveAllExpiredMemberships(uint32) (runs: 1000, μ: 4516570, ~: 2259520)
+WakuRlnV2Test:test__RemoveExpiredMemberships(uint32) (runs: 1000, μ: 1055797, ~: 1055798)
+WakuRlnV2Test:test__TokenTransferFailures() (gas: 4139092)
 WakuRlnV2Test:test__UnauthorizedMerkleTreeModifications() (gas: 1113852)
 WakuRlnV2Test:test__Upgrade() (gas: 6702671)
 WakuRlnV2Test:test__UpgradeWithInvalidImplementation() (gas: 51496)
-WakuRlnV2Test:test__ValidPaginationQuery(uint32) (runs: 1001, μ: 386547, ~: 134452)
+WakuRlnV2Test:test__ValidPaginationQuery(uint32) (runs: 1000, μ: 378536, ~: 134452)
 WakuRlnV2Test:test__ValidPaginationQuery__OneElement() (gas: 301276)
-WakuRlnV2Test:test__ValidRegistration(uint32) (runs: 1001, μ: 307585, ~: 307585)
-WakuRlnV2Test:test__ValidRegistrationExpiry(uint32) (runs: 1001, μ: 288640, ~: 288640)
-WakuRlnV2Test:test__ValidRegistrationExtend(uint32) (runs: 1001, μ: 534996, ~: 534996)
-WakuRlnV2Test:test__ValidRegistrationExtendSingleMembership(uint32) (runs: 1001, μ: 296279, ~: 296279)
-WakuRlnV2Test:test__ValidRegistrationNoGracePeriod(uint32) (runs: 1001, μ: 292251, ~: 292251)
-WakuRlnV2Test:test__ValidRegistrationWithEraseList() (gas: 1303567)
+WakuRlnV2Test:test__ValidRegistration(uint32) (runs: 1000, μ: 307650, ~: 307650)
+WakuRlnV2Test:test__ValidRegistrationExpiry(uint32) (runs: 1000, μ: 288640, ~: 288640)
+WakuRlnV2Test:test__ValidRegistrationExtend(uint32) (runs: 1000, μ: 534996, ~: 534996)
+WakuRlnV2Test:test__ValidRegistrationExtendSingleMembership(uint32) (runs: 1000, μ: 296279, ~: 296279)
+WakuRlnV2Test:test__ValidRegistrationNoGracePeriod(uint32) (runs: 1000, μ: 292251, ~: 292251)
+WakuRlnV2Test:test__ValidRegistrationWithEraseList() (gas: 1337020)
 WakuRlnV2Test:test__ValidRegistration__kats() (gas: 277614)
-WakuRlnV2Test:test__WithdrawToken(uint32) (runs: 1001, μ: 277708, ~: 277708)
+WakuRlnV2Test:test__WithdrawToken(uint32) (runs: 1000, μ: 283285, ~: 283286)
 WakuRlnV2Test:test__ZeroGracePeriodDuration() (gas: 8156320)
-WakuRlnV2Test:test__ZeroPriceEdgeCase() (gas: 791578)
-WakuRlnV2Test:test__indexReuse_eraseMemberships(uint32) (runs: 1001, μ: 4189422, ~: 1421226)
\ No newline at end of file
+WakuRlnV2Test:test__ZeroPriceEdgeCase() (gas: 791643)
+WakuRlnV2Test:test__indexReuse_eraseMemberships(uint32) (runs: 1000, μ: 4269053, ~: 1835792)
\ No newline at end of file
diff --git a/test/EchidnaReplayRaces.t.sol b/test/EchidnaReplayRaces.t.sol.archived
similarity index 100%
rename from test/EchidnaReplayRaces.t.sol
rename to test/EchidnaReplayRaces.t.sol.archived