diff --git a/.gas-snapshot b/.gas-snapshot
index 0bc4f03..f50e71b 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -1,164 +1,173 @@
-ClawbackMetadataTest:testDurationAndUnlocksAt() (gas: 500421)
-ClawbackMetadataTest:testMetadataPropertiesERC1155((uint8,uint32,uint56,uint256),(bool,bool,uint56,address)) (runs: 1039, μ: 154875, ~: 143488)
-ClawbackMetadataTest:testMetadataPropertiesERC20((uint8,uint32,uint56,uint256),(bool,bool,uint56,address)) (runs: 1039, μ: 160083, ~: 159991)
-ClawbackMetadataTest:testMetadataPropertiesERC721((uint8,uint32,uint56,uint256),(bool,bool,uint56,address)) (runs: 1039, μ: 257487, ~: 253950)
-ClawbackMetadataTest:testSupportsInterface() (gas: 9592)
-ClawbackTest:testAddTemplate(address,uint56,bool,bool) (runs: 1039, μ: 46910, ~: 46910)
-ClawbackTest:testAddTemplateTransferer(address,address) (runs: 1039, μ: 77227, ~: 77227)
-ClawbackTest:testAddTemplateTransfererInvalidCaller(address,address,bool,address) (runs: 1039, μ: 62762, ~: 49948)
-ClawbackTest:testAddToWrap(address,uint8,uint256,uint256,uint56,address,uint64) (runs: 1034, μ: 284578, ~: 260533)
-ClawbackTest:testAddToWrapInvalidWrappedId(uint256,uint256,address) (runs: 1039, μ: 13962, ~: 13962)
-ClawbackTest:testClawback(uint8,uint256,uint256,uint56,address,address) (runs: 1039, μ: 278393, ~: 300591)
-ClawbackTest:testClawbackAfterTransfer(uint8,uint256,uint256,uint56,address,address,address) (runs: 1039, μ: 306340, ~: 324569)
-ClawbackTest:testClawbackDestructionOnly(uint8,uint256,uint256,uint56,address) (runs: 1039, μ: 279480, ~: 305386)
-ClawbackTest:testClawbackDestructionOnlyInvalidReceiver(uint8,uint256,uint256,uint56,address,address) (runs: 1039, μ: 268105, ~: 292743)
-ClawbackTest:testClawbackInvalidCaller(uint8,uint256,uint256,uint56,address,address) (runs: 1039, μ: 234634, ~: 259026)
-ClawbackTest:testClawbackInvalidUnlocked(uint8,uint256,uint256,uint56,address,address) (runs: 1039, μ: 261908, ~: 286546)
-ClawbackTest:testEmergencyClawback(uint8,uint256,uint256,uint56,address,address) (runs: 1039, μ: 290284, ~: 317480)
-ClawbackTest:testEmergencyClawbackAfterTransfer(uint8,uint256,uint256,uint56,address,address,address) (runs: 1039, μ: 314696, ~: 340954)
-ClawbackTest:testEmergencyClawbackDestructionOnly(uint8,uint256,uint256,uint56,address) (runs: 1039, μ: 290115, ~: 321415)
-ClawbackTest:testEmergencyClawbackDestructionOnlyInvalidReceiver(uint8,uint256,uint256,uint56,address,address) (runs: 1039, μ: 268625, ~: 293263)
-ClawbackTest:testEmergencyClawbackInvalidCaller(uint8,uint256,uint256,uint56,address,address) (runs: 1039, μ: 233702, ~: 258094)
-ClawbackTest:testEmergencyClawbackInvalidUnlocked(uint8,uint256,uint256,uint56,address,address) (runs: 1039, μ: 262318, ~: 286956)
-ClawbackTest:testPreventsOnERC1155Received(uint256,uint256) (runs: 1039, μ: 100410, ~: 100332)
-ClawbackTest:testPreventsOnERC1155Received(uint256,uint256,uint256,uint256) (runs: 1039, μ: 159335, ~: 159413)
-ClawbackTest:testPreventsOnERC721Received(uint256) (runs: 1039, μ: 118352, ~: 118352)
+ClawbackMetadataTest:testDurationAndUnlocksAt() (gas: 500605)
+ClawbackMetadataTest:testMetadataPropertiesERC1155((uint8,uint32,uint56,uint256),(bool,bool,uint56,address)) (runs: 1024, μ: 157884, ~: 147382)
+ClawbackMetadataTest:testMetadataPropertiesERC20((uint8,uint32,uint56,uint256),(bool,bool,uint56,address)) (runs: 1024, μ: 160168, ~: 160139)
+ClawbackMetadataTest:testMetadataPropertiesERC721((uint8,uint32,uint56,uint256),(bool,bool,uint56,address)) (runs: 1024, μ: 258473, ~: 254753)
+ClawbackMetadataTest:testSupportsInterface() (gas: 9612)
+ClawbackTest:testAddTemplate(address,uint56,bool,bool) (runs: 1024, μ: 46910, ~: 46910)
+ClawbackTest:testAddTemplateTransferer(address,address) (runs: 1024, μ: 77227, ~: 77227)
+ClawbackTest:testAddTemplateTransfererInvalidCaller(address,address,bool,address) (runs: 1024, μ: 62924, ~: 75750)
+ClawbackTest:testAddToWrap(address,uint8,uint256,uint256,uint56,address,uint64) (runs: 1024, μ: 285089, ~: 260572)
+ClawbackTest:testAddToWrapInvalidWrappedId(uint256,uint256,address) (runs: 1024, μ: 13962, ~: 13962)
+ClawbackTest:testClawback(uint8,uint256,uint256,uint56,address,address) (runs: 1024, μ: 279425, ~: 300635)
+ClawbackTest:testClawbackAfterTransfer(uint8,uint256,uint256,uint56,address,address,address) (runs: 1024, μ: 306002, ~: 324613)
+ClawbackTest:testClawbackDestructionOnly(uint8,uint256,uint256,uint56,address) (runs: 1024, μ: 280166, ~: 305452)
+ClawbackTest:testClawbackDestructionOnlyInvalidReceiver(uint8,uint256,uint256,uint56,address,address) (runs: 1024, μ: 269170, ~: 292765)
+ClawbackTest:testClawbackInvalidCaller(uint8,uint256,uint256,uint56,address,address) (runs: 1024, μ: 235662, ~: 259070)
+ClawbackTest:testClawbackInvalidUnlocked(uint8,uint256,uint256,uint56,address,address) (runs: 1024, μ: 262973, ~: 286568)
+ClawbackTest:testEmergencyClawback(uint8,uint256,uint256,uint56,address,address) (runs: 1024, μ: 291479, ~: 317524)
+ClawbackTest:testEmergencyClawbackAfterTransfer(uint8,uint256,uint256,uint56,address,address,address) (runs: 1024, μ: 314150, ~: 340998)
+ClawbackTest:testEmergencyClawbackDestructionOnly(uint8,uint256,uint256,uint56,address) (runs: 1024, μ: 290872, ~: 321459)
+ClawbackTest:testEmergencyClawbackDestructionOnlyInvalidReceiver(uint8,uint256,uint256,uint56,address,address) (runs: 1024, μ: 269690, ~: 293285)
+ClawbackTest:testEmergencyClawbackInvalidCaller(uint8,uint256,uint256,uint56,address,address) (runs: 1024, μ: 234708, ~: 258116)
+ClawbackTest:testEmergencyClawbackInvalidUnlocked(uint8,uint256,uint256,uint56,address,address) (runs: 1024, μ: 263383, ~: 286978)
+ClawbackTest:testPreventsOnERC1155Received(uint256,uint256) (runs: 1024, μ: 100436, ~: 100354)
+ClawbackTest:testPreventsOnERC1155Received(uint256,uint256,uint256,uint256) (runs: 1024, μ: 159373, ~: 159370)
+ClawbackTest:testPreventsOnERC721Received(uint256) (runs: 1024, μ: 118375, ~: 118374)
 ClawbackTest:testSupportsInterface() (gas: 13448)
-ClawbackTest:testTransferByTransfererAsFrom(uint8,uint256,uint256,uint56,uint64,bool,address,bool) (runs: 1039, μ: 277583, ~: 300644)
-ClawbackTest:testTransferByTransfererAsOperator(uint8,uint256,uint256,uint56,uint64,bool,address,address,bool) (runs: 1038, μ: 302382, ~: 326940)
-ClawbackTest:testTransferByTransfererAsTo(uint8,uint256,uint256,uint56,uint64,bool,address,bool) (runs: 1039, μ: 278134, ~: 301195)
-ClawbackTest:testTransferByTransfererNotApproved(uint8,uint256,uint256,uint56,uint64,bool,address,address,bool) (runs: 1038, μ: 269142, ~: 294659)
-ClawbackTest:testTransferInvalidOperator(uint8,uint256,uint256,uint56,address,address,bool) (runs: 1038, μ: 270412, ~: 294441)
-ClawbackTest:testTransferOpen(uint8,uint256,uint256,uint56,uint64,address) (runs: 1039, μ: 250211, ~: 275161)
-ClawbackTest:testUnwrap(address,uint8,uint256,uint256,uint56,uint64) (runs: 1039, μ: 237198, ~: 243143)
-ClawbackTest:testUnwrapAfterTransfer(address,uint8,uint256,uint256,uint56,uint64,address) (runs: 1039, μ: 272443, ~: 288714)
-ClawbackTest:testUnwrapByInvalidOperator(address,address,uint8,uint256,uint256,uint56) (runs: 1039, μ: 233505, ~: 259371)
-ClawbackTest:testUnwrapByOperator(address,address,uint8,uint256,uint256,uint56,uint64) (runs: 1039, μ: 268523, ~: 276227)
-ClawbackTest:testUnwrapInvalidAmount(address,uint8,uint256,uint256,uint256,uint56) (runs: 1038, μ: 231941, ~: 258219)
-ClawbackTest:testUnwrapInvalidToken(address,uint8,uint256,uint256,uint256,uint56) (runs: 1038, μ: 237316, ~: 263517)
-ClawbackTest:testUnwrapTokenLocked(address,uint8,uint256,uint256,uint56) (runs: 1039, μ: 230314, ~: 255574)
-ClawbackTest:testUpdateTemplateAdmin(address,address,uint56,bool,bool) (runs: 1039, μ: 76260, ~: 76260)
-ClawbackTest:testUpdateTemplateAdminInvalidAdmin() (gas: 49830)
-ClawbackTest:testUpdateTemplateAdminInvalidCaller(address,address,bool) (runs: 1039, μ: 63611, ~: 76202)
-ClawbackTest:testUpdateTemplateInvalidCaller(address,address,bool,uint56,bool,bool) (runs: 1039, μ: 62153, ~: 50111)
+ClawbackTest:testTransferByTransfererAsFrom(uint8,uint256,uint256,uint56,uint64,bool,address,bool) (runs: 1024, μ: 276537, ~: 300766)
+ClawbackTest:testTransferByTransfererAsOperator(uint8,uint256,uint256,uint56,uint64,bool,address,address,bool) (runs: 1024, μ: 301420, ~: 326941)
+ClawbackTest:testTransferByTransfererAsTo(uint8,uint256,uint256,uint56,uint64,bool,address,bool) (runs: 1024, μ: 277110, ~: 301339)
+ClawbackTest:testTransferByTransfererNotApproved(uint8,uint256,uint256,uint56,uint64,bool,address,address,bool) (runs: 1024, μ: 268184, ~: 294638)
+ClawbackTest:testTransferInvalidOperator(uint8,uint256,uint256,uint56,address,address,bool) (runs: 1024, μ: 269383, ~: 294463)
+ClawbackTest:testTransferOpen(uint8,uint256,uint256,uint56,uint64,address) (runs: 1024, μ: 251219, ~: 275183)
+ClawbackTest:testUnwrap(address,uint8,uint256,uint256,uint56,uint64) (runs: 1024, μ: 236990, ~: 243165)
+ClawbackTest:testUnwrapAfterTransfer(address,uint8,uint256,uint256,uint56,uint64,address) (runs: 1024, μ: 273806, ~: 288749)
+ClawbackTest:testUnwrapByInvalidOperator(address,address,uint8,uint256,uint256,uint56) (runs: 1024, μ: 233229, ~: 259415)
+ClawbackTest:testUnwrapByOperator(address,address,uint8,uint256,uint256,uint56,uint64) (runs: 1024, μ: 268073, ~: 276271)
+ClawbackTest:testUnwrapInvalidAmount(address,uint8,uint256,uint256,uint256,uint56) (runs: 1024, μ: 232938, ~: 258241)
+ClawbackTest:testUnwrapInvalidToken(address,uint8,uint256,uint256,uint256,uint56) (runs: 1024, μ: 238423, ~: 263539)
+ClawbackTest:testUnwrapTokenLocked(address,uint8,uint256,uint256,uint56) (runs: 1024, μ: 229980, ~: 255596)
+ClawbackTest:testUpdateTemplateAdmin(address,address,uint56,bool,bool) (runs: 1024, μ: 76260, ~: 76261)
+ClawbackTest:testUpdateTemplateAdminInvalidAdmin() (gas: 49852)
+ClawbackTest:testUpdateTemplateAdminInvalidCaller(address,address,bool) (runs: 1024, μ: 63348, ~: 76224)
+ClawbackTest:testUpdateTemplateInvalidCaller(address,address,bool,uint56,bool,bool) (runs: 1024, μ: 62632, ~: 50111)
 ClawbackTest:testUpdateTemplateInvalidDestructionOnly() (gas: 49760)
-ClawbackTest:testUpdateTemplateInvalidDuration(address,uint56,bool,bool,uint56) (runs: 1031, μ: 51268, ~: 51268)
+ClawbackTest:testUpdateTemplateInvalidDuration(address,uint56,bool,bool,uint56) (runs: 1024, μ: 51268, ~: 51268)
 ClawbackTest:testUpdateTemplateInvalidTransferOpen() (gas: 50208)
-ClawbackTest:testUpdateTemplateOperator(address,address,bool) (runs: 1039, μ: 67274, ~: 76985)
-ClawbackTest:testUpdateTemplateOperatorInvalidCaller(address,address,bool,address,bool) (runs: 1039, μ: 63792, ~: 76084)
-ClawbackTest:testUpdateTemplateValid(address,uint56,bool,bool,uint56,bool,bool) (runs: 1039, μ: 59337, ~: 59458)
-ClawbackTest:testWrap(address,uint8,uint256,uint256,address) (runs: 1038, μ: 255945, ~: 281166)
-ClawbackTest:testWrapInvalidAmount(address,uint8,uint256,uint256,address) (runs: 1039, μ: 209412, ~: 221861)
-ClawbackTest:testWrapInvalidRewrapping(uint8,uint256,uint256,uint56,address) (runs: 1039, μ: 227270, ~: 254783)
-ClawbackTest:testWrapInvalidTemplate(uint32,uint8,uint256,uint256,address) (runs: 1039, μ: 105359, ~: 115140)
-ClawbackTest:testWrapInvalidTokenType(address,uint8,uint256,uint256) (runs: 1036, μ: 144431, ~: 152283)
-ERC1155ItemsTest:testBatchMintOwner(uint256[],uint256[]) (runs: 1039, μ: 569705, ~: 584336)
-ERC1155ItemsTest:testBatchMintWithRole(address,uint256[],uint256[]) (runs: 1038, μ: 655533, ~: 668432)
-ERC1155ItemsTest:testBurnBatchInvalidOwnership(address,uint256[],uint256[]) (runs: 1038, μ: 230564, ~: 232705)
-ERC1155ItemsTest:testBurnBatchSuccess(address,uint256[],uint256[],uint256[]) (runs: 1038, μ: 198175, ~: 196199)
-ERC1155ItemsTest:testBurnInvalidOwnership(address,uint256,uint256,uint256) (runs: 1031, μ: 109574, ~: 110848)
-ERC1155ItemsTest:testBurnSuccess(address,uint256,uint256,uint256) (runs: 1032, μ: 125834, ~: 125894)
+ClawbackTest:testUpdateTemplateOperator(address,address,bool) (runs: 1024, μ: 67054, ~: 76985)
+ClawbackTest:testUpdateTemplateOperatorInvalidCaller(address,address,bool,address,bool) (runs: 1024, μ: 63108, ~: 50285)
+ClawbackTest:testUpdateTemplateValid(address,uint56,bool,bool,uint56,bool,bool) (runs: 1024, μ: 59336, ~: 59458)
+ClawbackTest:testWrap(address,uint8,uint256,uint256,address) (runs: 1024, μ: 256053, ~: 281166)
+ClawbackTest:testWrapInvalidAmount(address,uint8,uint256,uint256,address) (runs: 1024, μ: 210087, ~: 221861)
+ClawbackTest:testWrapInvalidRewrapping(uint8,uint256,uint256,uint56,address) (runs: 1024, μ: 227976, ~: 254805)
+ClawbackTest:testWrapInvalidTemplate(uint32,uint8,uint256,uint256,address) (runs: 1024, μ: 106233, ~: 115140)
+ClawbackTest:testWrapInvalidTokenType(address,uint8,uint256,uint256) (runs: 1024, μ: 145171, ~: 152283)
+ERC1155ItemsTest:testBatchMintOwner(uint256[],uint256[]) (runs: 1024, μ: 576935, ~: 587455)
+ERC1155ItemsTest:testBatchMintWithRole(address,uint256[],uint256[]) (runs: 1024, μ: 661940, ~: 671839)
+ERC1155ItemsTest:testBurnBatchInvalidOwnership(address,uint256[],uint256[]) (runs: 1024, μ: 231087, ~: 233624)
+ERC1155ItemsTest:testBurnBatchSuccess(address,uint256[],uint256[],uint256[]) (runs: 1024, μ: 197974, ~: 196202)
+ERC1155ItemsTest:testBurnInvalidOwnership(address,uint256,uint256,uint256) (runs: 1024, μ: 109179, ~: 110870)
+ERC1155ItemsTest:testBurnSuccess(address,uint256,uint256,uint256) (runs: 1024, μ: 125849, ~: 125879)
 ERC1155ItemsTest:testContractURI() (gas: 83132)
-ERC1155ItemsTest:testDefaultRoyalty(address,uint96,uint256) (runs: 1027, μ: 41446, ~: 41446)
-ERC1155ItemsTest:testFactoryDetermineAddress(address,address,string,string,string,address,uint96) (runs: 1038, μ: 6718918, ~: 6718702)
-ERC1155ItemsTest:testMetadataInvalid(address) (runs: 1039, μ: 66770, ~: 66770)
+ERC1155ItemsTest:testDefaultRoyalty(address,uint96,uint256) (runs: 1024, μ: 41468, ~: 41468)
+ERC1155ItemsTest:testFactoryDetermineAddress(address,address,string,string,string,address,uint96) (runs: 1024, μ: 6720772, ~: 6720833)
+ERC1155ItemsTest:testMetadataInvalid(address) (runs: 1024, μ: 66770, ~: 66770)
 ERC1155ItemsTest:testMetadataOwner() (gas: 43862)
-ERC1155ItemsTest:testMetadataWithRole(address) (runs: 1039, μ: 117392, ~: 117392)
-ERC1155ItemsTest:testMintInvalidRole(address) (runs: 1039, μ: 122424, ~: 122424)
-ERC1155ItemsTest:testMintOwner(uint256,uint256) (runs: 1039, μ: 104895, ~: 104895)
-ERC1155ItemsTest:testMintWithRole(address,uint256,uint256) (runs: 1039, μ: 187902, ~: 188535)
+ERC1155ItemsTest:testMetadataWithRole(address) (runs: 1024, μ: 117392, ~: 117392)
+ERC1155ItemsTest:testMintInvalidRole(address) (runs: 1024, μ: 122424, ~: 122424)
+ERC1155ItemsTest:testMintOwner(uint256,uint256) (runs: 1024, μ: 107378, ~: 107378)
+ERC1155ItemsTest:testMintWithRole(address,uint256,uint256) (runs: 1024, μ: 190437, ~: 191021)
 ERC1155ItemsTest:testOwnerHasRoles() (gas: 46365)
-ERC1155ItemsTest:testReinitializeFails() (gas: 27964)
-ERC1155ItemsTest:testRoyaltyInvalidRole(address,uint256,address,uint96,uint256) (runs: 1028, μ: 121054, ~: 121054)
-ERC1155ItemsTest:testRoyaltyWithRole(address,uint256,address,uint96,uint256) (runs: 1028, μ: 154172, ~: 154355)
+ERC1155ItemsTest:testReinitializeFails() (gas: 27986)
+ERC1155ItemsTest:testRoyaltyInvalidRole(address,uint256,address,uint96,uint256) (runs: 1024, μ: 121054, ~: 121054)
+ERC1155ItemsTest:testRoyaltyWithRole(address,uint256,address,uint96,uint256) (runs: 1024, μ: 154232, ~: 154355)
 ERC1155ItemsTest:testSelectorCollision() (gas: 82659)
 ERC1155ItemsTest:testSupportsInterface() (gas: 34330)
-ERC1155ItemsTest:testTokenRoyalty(uint256,address,uint96,uint256) (runs: 1026, μ: 65139, ~: 65139)
-ERC1155SaleTest:testERC20Mint(bool,address,uint256,uint256) (runs: 1039, μ: 3393075, ~: 716247)
-ERC1155SaleTest:testERC20MintFailPaidETH(bool,address,uint256,uint256) (runs: 1039, μ: 3305571, ~: 623141)
-ERC1155SaleTest:testFactoryDetermineAddress(address,address,address) (runs: 1039, μ: 5458400, ~: 5458400)
-ERC1155SaleTest:testFreeGlobalMint(bool,address,uint256,uint256) (runs: 1039, μ: 2838409, ~: 162267)
-ERC1155SaleTest:testFreeTokenMint(bool,address,uint256,uint256) (runs: 1039, μ: 2885942, ~: 209073)
-ERC1155SaleTest:testMerkleFailBadProof(address[],address,uint256,bool) (runs: 1039, μ: 285743, ~: 293451)
-ERC1155SaleTest:testMerkleFailNoProof(address[],address,uint256,bool) (runs: 1039, μ: 281584, ~: 288773)
-ERC1155SaleTest:testMerkleReuseFail(address[],uint256,uint256,bool) (runs: 1037, μ: 414753, ~: 424797)
-ERC1155SaleTest:testMerkleSuccess(address[],uint256,uint256,bool) (runs: 1037, μ: 406382, ~: 416140)
-ERC1155SaleTest:testMerkleSuccessGlobalMultiple(address[],uint256,uint256[]) (runs: 1037, μ: 464975, ~: 464498)
-ERC1155SaleTest:testMintExpiredGlobalFail(bool,address,uint256,uint256,uint64,uint64) (runs: 1039, μ: 2847032, ~: 97515)
-ERC1155SaleTest:testMintExpiredSingleFail(bool,address,uint256,uint256,uint64,uint64) (runs: 1039, μ: 2847362, ~: 97844)
-ERC1155SaleTest:testMintFailMaxTotal(bool,address,uint256,uint256) (runs: 1039, μ: 2869174, ~: 185244)
-ERC1155SaleTest:testMintFailWrongPaymentToken(bool,address,uint256,uint256,address) (runs: 1039, μ: 3356833, ~: 609030)
-ERC1155SaleTest:testMintGlobalSuccess(bool,address,uint256,uint256) (runs: 1039, μ: 2867230, ~: 191088)
-ERC1155SaleTest:testMintGlobalSupplyExceeded(bool,address,uint256,uint256,uint256) (runs: 1039, μ: 2925533, ~: 5661882)
-ERC1155SaleTest:testMintGroupSuccess(bool,address,uint256,uint256) (runs: 1039, μ: 2972759, ~: 295888)
-ERC1155SaleTest:testMintInactiveFail(bool,address,uint256,uint256) (runs: 1039, μ: 2727658, ~: 47156)
-ERC1155SaleTest:testMintInactiveInGroupFail(bool,address,uint256,uint256) (runs: 1039, μ: 2784636, ~: 104376)
-ERC1155SaleTest:testMintInactiveSingleFail(bool,address,uint256,uint256) (runs: 1039, μ: 2782555, ~: 102294)
-ERC1155SaleTest:testMintSingleSuccess(bool,address,uint256,uint256) (runs: 1039, μ: 2867325, ~: 191180)
-ERC1155SaleTest:testMintTokenSupplyExceeded(bool,address,uint256,uint256,uint256) (runs: 1039, μ: 2924006, ~: 5660358)
+ERC1155ItemsTest:testTokenRoyalty(uint256,address,uint96,uint256) (runs: 1024, μ: 65161, ~: 65161)
+ERC1155SaleTest:testERC20Mint(bool,address,uint256,uint256) (runs: 1024, μ: 3403798, ~: 716548)
+ERC1155SaleTest:testERC20MintFailPaidETH(bool,address,uint256,uint256) (runs: 1024, μ: 3318488, ~: 625622)
+ERC1155SaleTest:testFactoryDetermineAddress(address,address,address) (runs: 1024, μ: 5465831, ~: 5465831)
+ERC1155SaleTest:testFreeGlobalMint(bool,address,uint256,uint256) (runs: 1024, μ: 2849078, ~: 162516)
+ERC1155SaleTest:testFreeTokenMint(bool,address,uint256,uint256) (runs: 1024, μ: 2896586, ~: 209295)
+ERC1155SaleTest:testMerkleFailBadProof(address[],address,uint256,bool) (runs: 1024, μ: 282253, ~: 280388)
+ERC1155SaleTest:testMerkleFailNoProof(address[],address,uint256,bool) (runs: 1024, μ: 278157, ~: 276235)
+ERC1155SaleTest:testMerkleReuseFail(address[],uint256,uint256,bool) (runs: 1024, μ: 404732, ~: 405619)
+ERC1155SaleTest:testMerkleSuccess(address[],uint256,uint256,bool) (runs: 1024, μ: 396161, ~: 396909)
+ERC1155SaleTest:testMerkleSuccessGlobalMultiple(address[],uint256,uint256[]) (runs: 1024, μ: 475005, ~: 484422)
+ERC1155SaleTest:testMintExpiredGlobalFail(bool,address,uint256,uint256,uint64,uint64) (runs: 1024, μ: 2795878, ~: 99797)
+ERC1155SaleTest:testMintExpiredSingleFail(bool,address,uint256,uint256,uint64,uint64) (runs: 1024, μ: 2796169, ~: 100087)
+ERC1155SaleTest:testMintFailMaxTotal(bool,address,uint256,uint256) (runs: 1024, μ: 2882377, ~: 188007)
+ERC1155SaleTest:testMintFailWrongPaymentToken(bool,address,uint256,uint256,address) (runs: 1024, μ: 3425257, ~: 6139498)
+ERC1155SaleTest:testMintGlobalSuccess(bool,address,uint256,uint256) (runs: 1024, μ: 2877929, ~: 191367)
+ERC1155SaleTest:testMintGlobalSupplyExceeded(bool,address,uint256,uint256,uint256) (runs: 1024, μ: 2943369, ~: 5669458)
+ERC1155SaleTest:testMintGroupSuccess(bool,address,uint256,uint256) (runs: 1024, μ: 2983535, ~: 296242)
+ERC1155SaleTest:testMintInactiveFail(bool,address,uint256,uint256) (runs: 1024, μ: 2742331, ~: 51398)
+ERC1155SaleTest:testMintInactiveInGroupFail(bool,address,uint256,uint256) (runs: 1024, μ: 2799413, ~: 108722)
+ERC1155SaleTest:testMintInactiveSingleFail(bool,address,uint256,uint256) (runs: 1024, μ: 2797206, ~: 106515)
+ERC1155SaleTest:testMintSingleSuccess(bool,address,uint256,uint256) (runs: 1024, μ: 2877985, ~: 191420)
+ERC1155SaleTest:testMintTokenSupplyExceeded(bool,address,uint256,uint256,uint256) (runs: 1024, μ: 2943464, ~: 5669556)
 ERC1155SaleTest:testSelectorCollision() (gas: 51971)
-ERC1155SaleTest:testSupportsInterface() (gas: 10896)
-ERC1155SaleTest:testWithdrawERC20(bool,address,uint256) (runs: 1039, μ: 3115372, ~: 456613)
-ERC1155SaleTest:testWithdrawETH(bool,address,uint256) (runs: 1039, μ: 2707013, ~: 46905)
-ERC1155SaleTest:testWithdrawFail(bool,address,uint256) (runs: 1039, μ: 3072647, ~: 460853)
-ERC20ItemsTest:testBurnInsufficient(address,uint256,uint256) (runs: 1030, μ: 80732, ~: 82008)
-ERC20ItemsTest:testBurnSuccess(address,uint256,uint256) (runs: 1032, μ: 90151, ~: 90217)
-ERC20ItemsTest:testFactoryDetermineAddress(address,address,string,string,uint8) (runs: 1038, μ: 5250695, ~: 5251395)
+ERC1155SaleTest:testSupportsInterface() (gas: 10893)
+ERC1155SaleTest:testWithdrawERC20(bool,address,uint256) (runs: 1024, μ: 3293262, ~: 6000742)
+ERC1155SaleTest:testWithdrawETH(bool,address,uint256) (runs: 1024, μ: 2884989, ~: 5593690)
+ERC1155SaleTest:testWithdrawFail(bool,address,uint256) (runs: 1024, μ: 3242654, ~: 5928350)
+ERC20ItemsTest:testBurnInsufficient(address,uint256,uint256) (runs: 1024, μ: 81152, ~: 82008)
+ERC20ItemsTest:testBurnSuccess(address,uint256,uint256) (runs: 1024, μ: 90239, ~: 90239)
+ERC20ItemsTest:testFactoryDetermineAddress(address,address,string,string,uint8) (runs: 1024, μ: 5252882, ~: 5251395)
 ERC20ItemsTest:testInitValues() (gas: 38152)
-ERC20ItemsTest:testMintInvalidRole(address,uint256) (runs: 1038, μ: 67299, ~: 67299)
-ERC20ItemsTest:testMintOwner(uint256) (runs: 1039, μ: 80616, ~: 80616)
-ERC20ItemsTest:testMintWithRole(address,uint256) (runs: 1038, μ: 164429, ~: 164429)
+ERC20ItemsTest:testMintInvalidRole(address,uint256) (runs: 1024, μ: 67321, ~: 67321)
+ERC20ItemsTest:testMintOwner(uint256) (runs: 1024, μ: 80602, ~: 80602)
+ERC20ItemsTest:testMintWithRole(address,uint256) (runs: 1024, μ: 164406, ~: 164406)
 ERC20ItemsTest:testOwnerHasRoles() (gas: 35476)
-ERC20ItemsTest:testReinitializeFails() (gas: 26988)
+ERC20ItemsTest:testReinitializeFails() (gas: 27010)
 ERC20ItemsTest:testSelectorCollision() (gas: 61795)
 ERC20ItemsTest:testSupportsInterface() (gas: 31231)
-ERC721ItemsTest:testBurnBatchInvalidOwnership(address) (runs: 1037, μ: 112693, ~: 112693)
-ERC721ItemsTest:testBurnBatchSuccess(address) (runs: 1037, μ: 174303, ~: 174303)
-ERC721ItemsTest:testBurnInvalidOwnership(address) (runs: 1037, μ: 109870, ~: 109870)
-ERC721ItemsTest:testBurnSuccess(address) (runs: 1037, μ: 138108, ~: 138108)
+ERC721ItemsTest:testBurnBatchInvalidOwnership(address) (runs: 1024, μ: 112693, ~: 112693)
+ERC721ItemsTest:testBurnBatchSuccess(address) (runs: 1024, μ: 174325, ~: 174325)
+ERC721ItemsTest:testBurnInvalidOwnership(address) (runs: 1024, μ: 109892, ~: 109892)
+ERC721ItemsTest:testBurnSuccess(address) (runs: 1024, μ: 138130, ~: 138130)
 ERC721ItemsTest:testContractURI() (gas: 85853)
-ERC721ItemsTest:testDefaultRoyalty(address,uint96,uint256) (runs: 1027, μ: 41423, ~: 41423)
-ERC721ItemsTest:testFactoryDetermineAddress(address,address,string,string,string,string,address,uint96) (runs: 1038, μ: 6792262, ~: 6793149)
-ERC721ItemsTest:testMetadataInvalid(address) (runs: 1039, μ: 69188, ~: 69188)
+ERC721ItemsTest:testDefaultRoyalty(address,uint96,uint256) (runs: 1024, μ: 41445, ~: 41445)
+ERC721ItemsTest:testFactoryDetermineAddress(address,address,string,string,string,string,address,uint96) (runs: 1024, μ: 6794789, ~: 6793149)
+ERC721ItemsTest:testMetadataInvalid(address) (runs: 1024, μ: 69188, ~: 69188)
 ERC721ItemsTest:testMetadataOwner() (gas: 130207)
-ERC721ItemsTest:testMetadataWithRole(address) (runs: 1038, μ: 117459, ~: 117459)
-ERC721ItemsTest:testMintInvalidRole(address) (runs: 1039, μ: 68300, ~: 68300)
-ERC721ItemsTest:testMintMultiple() (gas: 116419)
-ERC721ItemsTest:testMintOwner() (gas: 103222)
-ERC721ItemsTest:testMintWithRole(address) (runs: 1038, μ: 187284, ~: 187284)
+ERC721ItemsTest:testMetadataWithRole(address) (runs: 1024, μ: 117459, ~: 117459)
+ERC721ItemsTest:testMintInvalidRole(address) (runs: 1024, μ: 68300, ~: 68300)
+ERC721ItemsTest:testMintMultiple() (gas: 116440)
+ERC721ItemsTest:testMintOwner() (gas: 103203)
+ERC721ItemsTest:testMintWithRole(address) (runs: 1024, μ: 187295, ~: 187295)
 ERC721ItemsTest:testNameAndSymbol() (gas: 90129)
 ERC721ItemsTest:testOwnerHasRoles() (gas: 46710)
-ERC721ItemsTest:testReinitializeFails() (gas: 28529)
-ERC721ItemsTest:testRoyaltyInvalidRole(address,uint256,address,uint96,uint256) (runs: 1029, μ: 125741, ~: 125741)
-ERC721ItemsTest:testRoyaltyWithRole(address,uint256,address,uint96,uint256) (runs: 1029, μ: 154114, ~: 154333)
+ERC721ItemsTest:testReinitializeFails() (gas: 28551)
+ERC721ItemsTest:testRoyaltyInvalidRole(address,uint256,address,uint96,uint256) (runs: 1024, μ: 125741, ~: 125741)
+ERC721ItemsTest:testRoyaltyWithRole(address,uint256,address,uint96,uint256) (runs: 1024, μ: 154132, ~: 154333)
 ERC721ItemsTest:testSelectorCollision() (gas: 95069)
 ERC721ItemsTest:testSupportsInterface() (gas: 37278)
-ERC721ItemsTest:testTokenMetadata() (gas: 174842)
-ERC721ItemsTest:testTokenRoyalty(uint256,address,uint96,uint256) (runs: 1027, μ: 65201, ~: 65201)
-ERC721SaleTest:testERC20Mint(bool,address,uint256) (runs: 1024, μ: 3275957, ~: 5829157)
-ERC721SaleTest:testERC20MintFailMaxTotal(bool,address,uint256) (runs: 1024, μ: 3163850, ~: 5724070)
-ERC721SaleTest:testERC20MintFailPaidETH(bool,address,uint256) (runs: 1024, μ: 3147745, ~: 5707965)
-ERC721SaleTest:testETHMintFailMaxTotal(bool,address,uint256) (runs: 1024, μ: 2666765, ~: 5227053)
-ERC721SaleTest:testFactoryDetermineAddress(address,address,address) (runs: 1039, μ: 5065069, ~: 5065069)
-ERC721SaleTest:testFreeMint(bool,address,uint256) (runs: 1024, μ: 2723224, ~: 5276497)
-ERC721SaleTest:testMerkleFailBadProof(address[],address) (runs: 1039, μ: 290711, ~: 296760)
-ERC721SaleTest:testMerkleFailNoProof(address[],address) (runs: 1039, μ: 286715, ~: 292326)
-ERC721SaleTest:testMerkleReuseFail(address[],uint256) (runs: 1039, μ: 387183, ~: 381893)
-ERC721SaleTest:testMerkleSuccess(address[],uint256) (runs: 1039, μ: 380370, ~: 375088)
-ERC721SaleTest:testMintExpiredFail(bool,address,uint256,uint64,uint64) (runs: 1024, μ: 2676271, ~: 112433)
-ERC721SaleTest:testMintFailWrongPaymentToken(bool,address,uint256,address) (runs: 1024, μ: 3156015, ~: 5681075)
-ERC721SaleTest:testMintInactiveFail(bool,address,uint256) (runs: 1024, μ: 2620207, ~: 5180746)
-ERC721SaleTest:testMintSuccess(bool,address,uint256) (runs: 1024, μ: 2752285, ~: 5305558)
-ERC721SaleTest:testMintSupplyExceeded(bool,address,uint256,uint256) (runs: 1024, μ: 2656473, ~: 131387)
+ERC721ItemsTest:testTokenMetadata() (gas: 174823)
+ERC721ItemsTest:testTokenRoyalty(uint256,address,uint96,uint256) (runs: 1024, μ: 65223, ~: 65223)
+ERC721SaleTest:testERC20Mint(bool,address,uint256) (runs: 1024, μ: 3160418, ~: 720351)
+ERC721SaleTest:testERC20MintFailMaxTotal(bool,address,uint256) (runs: 1024, μ: 3048389, ~: 583551)
+ERC721SaleTest:testERC20MintFailPaidETH(bool,address,uint256) (runs: 1024, μ: 3032284, ~: 567446)
+ERC721SaleTest:testETHMintFailMaxTotal(bool,address,uint256) (runs: 1024, μ: 2551323, ~: 86420)
+ERC721SaleTest:testFactoryDetermineAddress(address,address,address) (runs: 1024, μ: 5065069, ~: 5065069)
+ERC721SaleTest:testFreeMint(bool,address,uint256) (runs: 1024, μ: 2607658, ~: 167521)
+ERC721SaleTest:testMerkleFailBadProof(address[],address) (runs: 1024, μ: 282442, ~: 278506)
+ERC721SaleTest:testMerkleFailNoProof(address[],address) (runs: 1024, μ: 278488, ~: 274565)
+ERC721SaleTest:testMerkleReuseFail(address[],uint256) (runs: 1024, μ: 382525, ~: 378954)
+ERC721SaleTest:testMerkleSuccess(address[],uint256) (runs: 1024, μ: 375700, ~: 372140)
+ERC721SaleTest:testMintExpiredFail(bool,address,uint256,uint64,uint64) (runs: 1024, μ: 2696471, ~: 5233189)
+ERC721SaleTest:testMintFailWrongPaymentToken(bool,address,uint256,address) (runs: 1024, μ: 3005394, ~: 540556)
+ERC721SaleTest:testMintInactiveFail(bool,address,uint256) (runs: 1024, μ: 2504732, ~: 39587)
+ERC721SaleTest:testMintSuccess(bool,address,uint256) (runs: 1024, μ: 2636738, ~: 196601)
+ERC721SaleTest:testMintSupplyExceeded(bool,address,uint256,uint256) (runs: 1024, μ: 2616314, ~: 131387)
 ERC721SaleTest:testSelectorCollision() (gas: 44619)
-ERC721SaleTest:testSupportsInterface() (gas: 10887)
-ERC721SaleTest:testWithdrawERC20(bool,address,uint256) (runs: 1039, μ: 2910784, ~: 455750)
-ERC721SaleTest:testWithdrawETH(bool,address,uint256) (runs: 1039, μ: 2502736, ~: 46368)
-ERC721SaleTest:testWithdrawFail(bool,address,uint256) (runs: 1039, μ: 2884379, ~: 460740)
+ERC721SaleTest:testSupportsInterface() (gas: 10884)
+ERC721SaleTest:testWithdrawERC20(bool,address,uint256) (runs: 1024, μ: 3092352, ~: 5599117)
+ERC721SaleTest:testWithdrawETH(bool,address,uint256) (runs: 1024, μ: 2684392, ~: 5192376)
+ERC721SaleTest:testWithdrawFail(bool,address,uint256) (runs: 1024, μ: 3038633, ~: 5527463)
+PaymentCombinerTest:testDetermineAddress(address[],uint256[]) (runs: 1024, μ: 646925, ~: 652205)
+PaymentCombinerTest:testListPayeeSplitters(address[],address[],uint256[],uint256[]) (runs: 1024, μ: 1258653, ~: 1269538)
+PaymentCombinerTest:testListPayeeSplittersOffsetLimit(address,address[][],uint256[],uint256,uint256) (runs: 1024, μ: 11982755, ~: 4814944)
+PaymentCombinerTest:testListReleasableERC20(uint256,address[],address[],uint256[],uint256[]) (runs: 1024, μ: 1368952, ~: 1380680)
+PaymentCombinerTest:testListReleasableNative(uint256,address[],address[],uint256[],uint256[]) (runs: 1024, μ: 1297385, ~: 1309113)
+PaymentCombinerTest:testListReleaseERC20(uint256,address[],address[],uint256[],uint256[]) (runs: 1024, μ: 1502846, ~: 1514574)
+PaymentCombinerTest:testListReleaseNative(uint256,address[],address[],uint256[],uint256[]) (runs: 1024, μ: 1438278, ~: 1450031)
+PaymentCombinerTest:testRepeatedDeploysFail(address[],uint256[]) (runs: 1024, μ: 1040378921, ~: 1040385358)
+PaymentCombinerTest:testSupportsInterface() (gas: 10684)
 SequenceProxyFactoryTest:testAddressCompute() (gas: 1021270)
-SequenceProxyFactoryTest:testDeployProxy() (gas: 1021687)
-SequenceProxyFactoryTest:testDeployProxyAfterUpgrade() (gas: 1033631)
-SequenceProxyFactoryTest:testDuplicateDeploysFail() (gas: 8937393460516761400)
-SequenceProxyFactoryTest:testProxyOwnerUpgrade() (gas: 1048464)
-SequenceProxyFactoryTest:testProxyOwnerUpgradeUnaffectedByBeaconUpgrades() (gas: 1063248)
-SequenceProxyFactoryTest:testUpgradeAfterDeploy() (gas: 1036230)
\ No newline at end of file
+SequenceProxyFactoryTest:testDeployProxy() (gas: 1021715)
+SequenceProxyFactoryTest:testDeployProxyAfterUpgrade() (gas: 1033634)
+SequenceProxyFactoryTest:testDuplicateDeploysFail() (gas: 1040461625)
+SequenceProxyFactoryTest:testProxyOwnerUpgrade() (gas: 1048467)
+SequenceProxyFactoryTest:testProxyOwnerUpgradeUnaffectedByBeaconUpgrades() (gas: 1063273)
+SequenceProxyFactoryTest:testUpgradeAfterDeploy() (gas: 1036252)
\ No newline at end of file