321 files changed, 188 insertions, 236 deletions
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CALL_OneVCallSuicideFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CALL_OneVCallSuicideFiller.json
index 5eef4df16..5eef4df16 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CALL_OneVCallSuicideFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CALL_OneVCallSuicideFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CALL_ZeroVCallSuicideFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CALL_ZeroVCallSuicideFiller.json
index 58794e85f..58794e85f 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CALL_ZeroVCallSuicideFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CALL_ZeroVCallSuicideFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInitFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_ContractSuicideDuringInitFiller.json
index 600c3f2dd..600c3f2dd 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInitFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_ContractSuicideDuringInitFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json
index 97e900424..97e900424 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValueFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_ContractSuicideDuringInit_WithValueFiller.json
index fb8609699..fb8609699 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValueFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_ContractSuicideDuringInit_WithValueFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json
index ae229557f..ae229557f 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_ContractSuicideDuringInit_WithValueToItselfFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EContractCreateEContractInInit_TrFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_EContractCreateEContractInInit_TrFiller.json
index fbf25acf5..fbf25acf5 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EContractCreateEContractInInit_TrFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_EContractCreateEContractInInit_TrFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EContractCreateNEContractInInitOOG_TrFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_EContractCreateNEContractInInitOOG_TrFiller.json
index 4e5e74b39..4e5e74b39 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EContractCreateNEContractInInitOOG_TrFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_EContractCreateNEContractInInitOOG_TrFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EContractCreateNEContractInInit_TrFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_EContractCreateNEContractInInit_TrFiller.json
index c7553b303..c7553b303 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EContractCreateNEContractInInit_TrFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_EContractCreateNEContractInInit_TrFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EContract_ThenCALLToNonExistentAccFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_EContract_ThenCALLToNonExistentAccFiller.json
index b791d2154..b791d2154 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EContract_ThenCALLToNonExistentAccFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_EContract_ThenCALLToNonExistentAccFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EmptyContractAndCallIt_0weiFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_EmptyContractAndCallIt_0weiFiller.json
index 07724e9a5..07724e9a5 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EmptyContractAndCallIt_0weiFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_EmptyContractAndCallIt_0weiFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EmptyContractAndCallIt_1weiFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_EmptyContractAndCallIt_1weiFiller.json
index beaf5735d..beaf5735d 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EmptyContractAndCallIt_1weiFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_EmptyContractAndCallIt_1weiFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json
index 7248d21e7..7248d21e7 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EmptyContractWithStorageAndCallIt_1weiFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_EmptyContractWithStorageAndCallIt_1weiFiller.json
index 3b2a2b7a4..3b2a2b7a4 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EmptyContractWithStorageAndCallIt_1weiFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_EmptyContractWithStorageAndCallIt_1weiFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EmptyContractWithStorageFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_EmptyContractWithStorageFiller.json
index 2a9aa2cde..2a9aa2cde 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EmptyContractWithStorageFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_EmptyContractWithStorageFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_empty000CreateinInitCode_TransactionFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_empty000CreateinInitCode_TransactionFiller.json
index fa5d1370a..fa5d1370a 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_empty000CreateinInitCode_TransactionFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CREATE_empty000CreateinInitCode_TransactionFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractAndCallItOOGFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallContractToCreateContractAndCallItOOGFiller.json
index c16b00166..c16b00166 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractAndCallItOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallContractToCreateContractAndCallItOOGFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractOOGBonusGasFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallContractToCreateContractOOGBonusGasFiller.json
index 4df215de1..4df215de1 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractOOGBonusGasFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallContractToCreateContractOOGBonusGasFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractOOGFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallContractToCreateContractOOGFiller.json
index f3dfa7a71..f3dfa7a71 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallContractToCreateContractOOGFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json
index eae0cbbb6..eae0cbbb6 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecover0Filler.json
index ccc1d53f6..ccc1d53f6 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecover0Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_0inputFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecover0_0inputFiller.json
index 4369d8b00..4369d8b00 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_0inputFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecover0_0inputFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_Gas2999Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecover0_Gas2999Filler.json
index 1a9492456..1a9492456 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_Gas2999Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecover0_Gas2999Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_NoGasFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecover0_NoGasFiller.json
index f674bab76..f674bab76 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_NoGasFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecover0_NoGasFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_completeReturnValueFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecover0_completeReturnValueFiller.json
index 77b284ff3..77b284ff3 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_completeReturnValueFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecover0_completeReturnValueFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_gas3000Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecover0_gas3000Filler.json
index c34a26e1d..c34a26e1d 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_gas3000Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecover0_gas3000Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_overlappingInputOutputFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecover0_overlappingInputOutputFiller.json
index b8a55364f..b8a55364f 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_overlappingInputOutputFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecover0_overlappingInputOutputFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecover1Filler.json
index 57c9c4159..57c9c4159 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecover1Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecover2Filler.json
index 69777a439..69777a439 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecover2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecover3Filler.json
index 4403fa29d..4403fa29d 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover3Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecover3Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover80Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecover80Filler.json
index d7945388e..d7945388e 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover80Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecover80Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverCheckLengthFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecoverCheckLengthFiller.json
index 93a97a505..93a97a505 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverCheckLengthFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecoverCheckLengthFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverCheckLengthWrongVFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecoverCheckLengthWrongVFiller.json
index 0340cdc8b..0340cdc8b 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverCheckLengthWrongVFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecoverCheckLengthWrongVFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverH_prefixed0Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecoverH_prefixed0Filler.json
index adaeb1c88..adaeb1c88 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverH_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecoverH_prefixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverR_prefixed0Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecoverR_prefixed0Filler.json
index 1967fa87a..1967fa87a 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverR_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecoverR_prefixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverS_prefixed0Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecoverS_prefixed0Filler.json
index 7c133de91..7c133de91 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverS_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecoverS_prefixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverV_prefixed0Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecoverV_prefixed0Filler.json
index b9c9d5719..b9c9d5719 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverV_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallEcrecoverV_prefixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallGoesOOGOnSecondLevel2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallGoesOOGOnSecondLevel2Filler.json
index 64fb1bd1f..64fb1bd1f 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallGoesOOGOnSecondLevel2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallGoesOOGOnSecondLevel2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallGoesOOGOnSecondLevelFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallGoesOOGOnSecondLevelFiller.json
index c1c4080a5..c1c4080a5 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallGoesOOGOnSecondLevelFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallGoesOOGOnSecondLevelFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentitiy_1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallIdentitiy_1Filler.json
index 18932500e..18932500e 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentitiy_1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallIdentitiy_1Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_1_nonzeroValueFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallIdentity_1_nonzeroValueFiller.json
index a78675055..a78675055 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_1_nonzeroValueFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallIdentity_1_nonzeroValueFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallIdentity_2Filler.json
index 4cacd8395..4cacd8395 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallIdentity_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallIdentity_3Filler.json
index 2a955f097..2a955f097 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_3Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallIdentity_3Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_4Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallIdentity_4Filler.json
index 9988f244a..9988f244a 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_4Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallIdentity_4Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_4_gas17Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallIdentity_4_gas17Filler.json
index cba3e65a7..cba3e65a7 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_4_gas17Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallIdentity_4_gas17Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_4_gas18Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallIdentity_4_gas18Filler.json
index ef8f874e1..ef8f874e1 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_4_gas18Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallIdentity_4_gas18Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_5Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallIdentity_5Filler.json
index 35c6e6aa4..35c6e6aa4 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_5Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallIdentity_5Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallLoseGasOOGFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallLoseGasOOGFiller.json
index 75955185e..75955185e 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallLoseGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallLoseGasOOGFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallRecursiveBomb0Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRecursiveBomb0Filler.json
index 1d524a05b..1d524a05b 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallRecursiveBomb0Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRecursiveBomb0Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json
index 240f958c7..240f958c7 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallRecursiveBomb1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRecursiveBomb1Filler.json
index b6911f4d9..b6911f4d9 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallRecursiveBomb1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRecursiveBomb1Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallRecursiveBomb2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRecursiveBomb2Filler.json
index 5e62952e4..5e62952e4 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallRecursiveBomb2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRecursiveBomb2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallRecursiveBomb3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRecursiveBomb3Filler.json
index 4c058cf4a..4c058cf4a 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallRecursiveBomb3Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRecursiveBomb3Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallRecursiveBombLog2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRecursiveBombLog2Filler.json
index 88bb7ebe2..88bb7ebe2 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallRecursiveBombLog2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRecursiveBombLog2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallRecursiveBombLogFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRecursiveBombLogFiller.json
index 2e71fb0e6..2e71fb0e6 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallRecursiveBombLogFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRecursiveBombLogFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallRecursiveBombPreCall2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRecursiveBombPreCall2Filler.json
index f9363a751..f9363a751 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallRecursiveBombPreCall2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRecursiveBombPreCall2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallRecursiveBombPreCallFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRecursiveBombPreCallFiller.json
index 47c006979..47c006979 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallRecursiveBombPreCallFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRecursiveBombPreCallFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRipemd160_1Filler.json
index a1ea7b7f1..a1ea7b7f1 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRipemd160_1Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRipemd160_2Filler.json
index 2398a9e5e..2398a9e5e 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRipemd160_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRipemd160_3Filler.json
index ca693e8f3..ca693e8f3 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_3Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRipemd160_3Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_3_postfixed0Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRipemd160_3_postfixed0Filler.json
index 4569fdbf9..4569fdbf9 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_3_postfixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRipemd160_3_postfixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_3_prefixed0Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRipemd160_3_prefixed0Filler.json
index 1efae3d19..1efae3d19 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_3_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRipemd160_3_prefixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_4Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRipemd160_4Filler.json
index 43ddff295..43ddff295 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_4Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRipemd160_4Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_4_gas719Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRipemd160_4_gas719Filler.json
index 1b6fe0b68..1b6fe0b68 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_4_gas719Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRipemd160_4_gas719Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_5Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRipemd160_5Filler.json
index 00a426ae2..00a426ae2 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_5Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallRipemd160_5Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallSha256_1Filler.json
index fc2835a96..fc2835a96 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallSha256_1Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_1_nonzeroValueFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallSha256_1_nonzeroValueFiller.json
index 972831d81..972831d81 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_1_nonzeroValueFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallSha256_1_nonzeroValueFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallSha256_2Filler.json
index 537742d43..537742d43 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallSha256_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallSha256_3Filler.json
index bbfeb4f0f..bbfeb4f0f 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_3Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallSha256_3Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_3_postfix0Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallSha256_3_postfix0Filler.json
index b6069d283..b6069d283 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_3_postfix0Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallSha256_3_postfix0Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_3_prefix0Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallSha256_3_prefix0Filler.json
index 0b5f19f68..0b5f19f68 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_3_prefix0Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallSha256_3_prefix0Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_4Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallSha256_4Filler.json
index dd39770c1..dd39770c1 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_4Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallSha256_4Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_4_gas99Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallSha256_4_gas99Filler.json
index 0df5e39b2..0df5e39b2 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_4_gas99Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallSha256_4_gas99Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_5Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallSha256_5Filler.json
index 158feec90..158feec90 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_5Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallSha256_5Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallToNameRegistrator0Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallToNameRegistrator0Filler.json
index 75e01a3d3..75e01a3d3 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallToNameRegistrator0Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallToNameRegistrator0Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallToNameRegistratorAddressTooBigLeftFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallToNameRegistratorAddressTooBigLeftFiller.json
index e46c436e3..e46c436e3 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallToNameRegistratorAddressTooBigLeftFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallToNameRegistratorAddressTooBigLeftFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallToNameRegistratorAddressTooBigRightFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallToNameRegistratorAddressTooBigRightFiller.json
index 6dd4fe67e..6dd4fe67e 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallToNameRegistratorAddressTooBigRightFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallToNameRegistratorAddressTooBigRightFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallToNameRegistratorMemOOGAndInsufficientBalanceFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallToNameRegistratorMemOOGAndInsufficientBalanceFiller.json
index 5152cc62f..5152cc62f 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallToNameRegistratorMemOOGAndInsufficientBalanceFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallToNameRegistratorMemOOGAndInsufficientBalanceFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallToNameRegistratorNotMuchMemory0Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallToNameRegistratorNotMuchMemory0Filler.json
index 42ef2c20f..42ef2c20f 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallToNameRegistratorNotMuchMemory0Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallToNameRegistratorNotMuchMemory0Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallToNameRegistratorNotMuchMemory1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallToNameRegistratorNotMuchMemory1Filler.json
index 85994c211..85994c211 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallToNameRegistratorNotMuchMemory1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallToNameRegistratorNotMuchMemory1Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallToNameRegistratorOutOfGasFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallToNameRegistratorOutOfGasFiller.json
index ddd611c2b..ddd611c2b 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallToNameRegistratorOutOfGasFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallToNameRegistratorOutOfGasFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallToNameRegistratorTooMuchMemory0Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallToNameRegistratorTooMuchMemory0Filler.json
index 6e528c503..6e528c503 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallToNameRegistratorTooMuchMemory0Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallToNameRegistratorTooMuchMemory0Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallToNameRegistratorTooMuchMemory1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallToNameRegistratorTooMuchMemory1Filler.json
index e241cb636..e241cb636 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallToNameRegistratorTooMuchMemory1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallToNameRegistratorTooMuchMemory1Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallToNameRegistratorTooMuchMemory2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallToNameRegistratorTooMuchMemory2Filler.json
index 25fa677a1..25fa677a1 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallToNameRegistratorTooMuchMemory2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallToNameRegistratorTooMuchMemory2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallToNameRegistratorZeorSizeMemExpansionFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallToNameRegistratorZeorSizeMemExpansionFiller.json
index c836df8a0..c836df8a0 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallToNameRegistratorZeorSizeMemExpansionFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallToNameRegistratorZeorSizeMemExpansionFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallToReturn1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallToReturn1Filler.json
index f621d4283..f621d4283 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallToReturn1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CallToReturn1Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CalltoReturn2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CalltoReturn2Filler.json
index fe07ae803..fe07ae803 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CalltoReturn2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_CalltoReturn2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ExecuteCallThatAskForeGasThenTrabsactionHasFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ExecuteCallThatAskForeGasThenTrabsactionHasFiller.json
index f1042c54d..f1042c54d 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ExecuteCallThatAskForeGasThenTrabsactionHasFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ExecuteCallThatAskForeGasThenTrabsactionHasFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_InternalCallHittingGasLimit2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_InternalCallHittingGasLimit2Filler.json
index 4f275d409..4f275d409 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_InternalCallHittingGasLimit2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_InternalCallHittingGasLimit2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_InternalCallHittingGasLimitFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_InternalCallHittingGasLimitFiller.json
index f097c8d68..f097c8d68 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_InternalCallHittingGasLimitFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_InternalCallHittingGasLimitFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_InternalCallHittingGasLimitSuccessFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_InternalCallHittingGasLimitSuccessFiller.json
index 114b829b2..114b829b2 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_InternalCallHittingGasLimitSuccessFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_InternalCallHittingGasLimitSuccessFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_InternlCallStoreClearsOOGFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_InternlCallStoreClearsOOGFiller.json
index 99233eefc..99233eefc 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_InternlCallStoreClearsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_InternlCallStoreClearsOOGFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_InternlCallStoreClearsSuccesFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_InternlCallStoreClearsSuccesFiller.json
index 85d7dfff2..85d7dfff2 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_InternlCallStoreClearsSuccesFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_InternlCallStoreClearsSuccesFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevert2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_LoopCallsDepthThenRevert2Filler.json
index ee9372be4..ee9372be4 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevert2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_LoopCallsDepthThenRevert2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevert3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_LoopCallsDepthThenRevert3Filler.json
index 584268c12..584268c12 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevert3Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_LoopCallsDepthThenRevert3Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevertFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_LoopCallsDepthThenRevertFiller.json
index b5ba25866..b5ba25866 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsDepthThenRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_LoopCallsDepthThenRevertFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsThenRevertFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_LoopCallsThenRevertFiller.json
index 2e4dd1720..2e4dd1720 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsThenRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_LoopCallsThenRevertFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_NewGasPriceForCodesFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_NewGasPriceForCodesFiller.json
index 47f3819ef..47f3819ef 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_NewGasPriceForCodesFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_NewGasPriceForCodesFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_NonZeroValue_CALL2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_NonZeroValue_CALL2Filler.json
index ecf078139..ecf078139 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_NonZeroValue_CALL2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_NonZeroValue_CALL2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_NonZeroValue_CALL_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_NonZeroValue_CALL_ToEmptyFiller.json
index 2e30f0fdb..2e30f0fdb 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_NonZeroValue_CALL_ToEmptyFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_NonZeroValue_CALL_ToEmptyFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_NonZeroValue_CALL_ToNonNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_NonZeroValue_CALL_ToNonNonZeroBalanceFiller.json
index 90ad0abee..90ad0abee 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_NonZeroValue_CALL_ToNonNonZeroBalanceFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_NonZeroValue_CALL_ToNonNonZeroBalanceFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_NonZeroValue_CALL_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_NonZeroValue_CALL_ToOneStorageKeyFiller.json
index 143d56246..143d56246 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_NonZeroValue_CALL_ToOneStorageKeyFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_NonZeroValue_CALL_ToOneStorageKeyFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_PostToReturn1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_PostToReturn1Filler.json
index 905297c4f..905297c4f 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_PostToReturn1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_PostToReturn1Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_RETURN_BoundsFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RETURN_BoundsFiller.json
index 7cb37c344..7cb37c344 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_RETURN_BoundsFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RETURN_BoundsFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_RETURN_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RETURN_BoundsOOGFiller.json
index 73d5c08f0..73d5c08f0 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_RETURN_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RETURN_BoundsOOGFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_RawCallGasAskFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RawCallGasAskFiller.json
index 57e5fa043..57e5fa043 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_RawCallGasAskFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RawCallGasAskFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_RawCallGasFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RawCallGasFiller.json
index de8687167..de8687167 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_RawCallGasFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RawCallGasFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_RawCallGasValueTransferAskFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RawCallGasValueTransferAskFiller.json
index c871aa37c..c871aa37c 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_RawCallGasValueTransferAskFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RawCallGasValueTransferAskFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_RawCallGasValueTransferFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RawCallGasValueTransferFiller.json
index d696fd52c..d696fd52c 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_RawCallGasValueTransferFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RawCallGasValueTransferFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_RawCallGasValueTransferMemoryAskFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RawCallGasValueTransferMemoryAskFiller.json
index c2c99289d..c2c99289d 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_RawCallGasValueTransferMemoryAskFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RawCallGasValueTransferMemoryAskFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_RawCallGasValueTransferMemoryFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RawCallGasValueTransferMemoryFiller.json
index 0695ae442..0695ae442 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_RawCallGasValueTransferMemoryFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RawCallGasValueTransferMemoryFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_RawCallMemoryGasAskFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RawCallMemoryGasAskFiller.json
index c4770c381..c4770c381 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_RawCallMemoryGasAskFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RawCallMemoryGasAskFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_RawCallMemoryGasFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RawCallMemoryGasFiller.json
index a2c81f978..a2c81f978 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_RawCallMemoryGasFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RawCallMemoryGasFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Return50000Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_Return50000Filler.json
index 4d1c7bbf4..4d1c7bbf4 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_Return50000Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_Return50000Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Return50000_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_Return50000_2Filler.json
index 36fff2e56..36fff2e56 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_Return50000_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_Return50000_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ReturnTest2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ReturnTest2Filler.json
index f9474cfc9..f9474cfc9 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ReturnTest2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ReturnTest2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ReturnTestFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ReturnTestFiller.json
index d98239273..d98239273 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ReturnTestFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ReturnTestFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_RevertDepth2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RevertDepth2Filler.json
index f3ef13ce0..f3ef13ce0 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_RevertDepth2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RevertDepth2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_RevertDepthCreateAddressCollisionFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RevertDepthCreateAddressCollisionFiller.json
index 46189db1a..46189db1a 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_RevertDepthCreateAddressCollisionFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RevertDepthCreateAddressCollisionFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_RevertDepthCreateOOGFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RevertDepthCreateOOGFiller.json
index a0a45db29..a0a45db29 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_RevertDepthCreateOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RevertDepthCreateOOGFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_RevertOpcodeCallsFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RevertOpcodeCallsFiller.json
index 8e07bc0df..8e07bc0df 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_RevertOpcodeCallsFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RevertOpcodeCallsFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_RevertOpcodeDirectCallFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RevertOpcodeDirectCallFiller.json
index 90f01a82d..90f01a82d 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_RevertOpcodeDirectCallFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RevertOpcodeDirectCallFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_RevertOpcodeMultipleSubCallsFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RevertOpcodeMultipleSubCallsFiller.json
index 9dbcdee84..9dbcdee84 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_RevertOpcodeMultipleSubCallsFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RevertOpcodeMultipleSubCallsFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_RevertOpcodeReturnFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RevertOpcodeReturnFiller.json
index 4bd1f6b65..4bd1f6b65 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_RevertOpcodeReturnFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RevertOpcodeReturnFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_RevertPrecompiledTouchFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RevertPrecompiledTouchFiller.json
index 9386a4766..9386a4766 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_RevertPrecompiledTouchFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RevertPrecompiledTouchFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_RevertPrefoundCallFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RevertPrefoundCallFiller.json
index 6cfc6c5e5..6cfc6c5e5 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_RevertPrefoundCallFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RevertPrefoundCallFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_RevertPrefoundCallOOGFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RevertPrefoundCallOOGFiller.json
index fa7a0ac4d..fa7a0ac4d 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_RevertPrefoundCallOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RevertPrefoundCallOOGFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_RevertPrefoundEmptyCallFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RevertPrefoundEmptyCallFiller.json
index c63955789..c63955789 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_RevertPrefoundEmptyCallFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RevertPrefoundEmptyCallFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_RevertPrefoundEmptyCallOOGFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RevertPrefoundEmptyCallOOGFiller.json
index 3ed5dbbc6..3ed5dbbc6 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_RevertPrefoundEmptyCallOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_RevertPrefoundEmptyCallOOGFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_StoreClearsAndInternlCallStoreClearsOOGFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_StoreClearsAndInternlCallStoreClearsOOGFiller.json
index f5dac0424..f5dac0424 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_StoreClearsAndInternlCallStoreClearsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_StoreClearsAndInternlCallStoreClearsOOGFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_StoreClearsAndInternlCallStoreClearsSuccessFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_StoreClearsAndInternlCallStoreClearsSuccessFiller.json
index 9d3a330f1..9d3a330f1 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_StoreClearsAndInternlCallStoreClearsSuccessFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_StoreClearsAndInternlCallStoreClearsSuccessFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_SuicideToExistingContractFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_SuicideToExistingContractFiller.json
index 726a622de..726a622de 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_SuicideToExistingContractFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_SuicideToExistingContractFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_SuicideToNotExistingContractFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_SuicideToNotExistingContractFiller.json
index 904aa1f19..904aa1f19 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_SuicideToNotExistingContractFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_SuicideToNotExistingContractFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_SuicidesAndInternlCallSuicidesBonusGasAtCallFailedFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_SuicidesAndInternlCallSuicidesBonusGasAtCallFailedFiller.json
index 1eb733f3d..1eb733f3d 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_SuicidesAndInternlCallSuicidesBonusGasAtCallFailedFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_SuicidesAndInternlCallSuicidesBonusGasAtCallFailedFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_SuicidesAndInternlCallSuicidesBonusGasAtCallFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_SuicidesAndInternlCallSuicidesBonusGasAtCallFiller.json
index c8f980f7a..c8f980f7a 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_SuicidesAndInternlCallSuicidesBonusGasAtCallFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_SuicidesAndInternlCallSuicidesBonusGasAtCallFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_SuicidesAndInternlCallSuicidesOOGFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_SuicidesAndInternlCallSuicidesOOGFiller.json
index cea315bc1..cea315bc1 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_SuicidesAndInternlCallSuicidesOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_SuicidesAndInternlCallSuicidesOOGFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_SuicidesAndInternlCallSuicidesSuccessFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_SuicidesAndInternlCallSuicidesSuccessFiller.json
index a9dc7b5cf..a9dc7b5cf 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_SuicidesAndInternlCallSuicidesSuccessFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_SuicidesAndInternlCallSuicidesSuccessFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_SuicidesStopAfterSuicideFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_SuicidesStopAfterSuicideFiller.json
index 2f4f714b2..2f4f714b2 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_SuicidesStopAfterSuicideFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_SuicidesStopAfterSuicideFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_TouchToEmptyAccountRevert2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_TouchToEmptyAccountRevert2Filler.json
index b902b60e0..b902b60e0 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_TouchToEmptyAccountRevert2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_TouchToEmptyAccountRevert2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_TouchToEmptyAccountRevert3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_TouchToEmptyAccountRevert3Filler.json
index 2be6fe5b2..2be6fe5b2 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_TouchToEmptyAccountRevert3Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_TouchToEmptyAccountRevert3Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_TouchToEmptyAccountRevertFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_TouchToEmptyAccountRevertFiller.json
index c90aaaf3f..c90aaaf3f 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_TouchToEmptyAccountRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_TouchToEmptyAccountRevertFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Transaction64Rule_d64e0Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_Transaction64Rule_d64e0Filler.json
index c9246cb52..c9246cb52 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_Transaction64Rule_d64e0Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_Transaction64Rule_d64e0Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Transaction64Rule_d64m1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_Transaction64Rule_d64m1Filler.json
index ebaecfe78..ebaecfe78 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_Transaction64Rule_d64m1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_Transaction64Rule_d64m1Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Transaction64Rule_d64p1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_Transaction64Rule_d64p1Filler.json
index 56231773b..56231773b 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_Transaction64Rule_d64p1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_Transaction64Rule_d64p1Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_CALL2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ZeroValue_CALL2Filler.json
index 1405535ea..1405535ea 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_CALL2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ZeroValue_CALL2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_CALL_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ZeroValue_CALL_OOGRevertFiller.json
index 711702a56..711702a56 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_CALL_OOGRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ZeroValue_CALL_OOGRevertFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_CALL_ToEmpty2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ZeroValue_CALL_ToEmpty2Filler.json
index b1c983b02..b1c983b02 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_CALL_ToEmpty2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ZeroValue_CALL_ToEmpty2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_CALL_ToEmpty_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ZeroValue_CALL_ToEmpty_OOGRevertFiller.json
index c10db9c3c..c10db9c3c 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_CALL_ToEmpty_OOGRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ZeroValue_CALL_ToEmpty_OOGRevertFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_CALL_ToNonZeroBalance2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ZeroValue_CALL_ToNonZeroBalance2Filler.json
index b77d0cfda..b77d0cfda 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_CALL_ToNonZeroBalance2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ZeroValue_CALL_ToNonZeroBalance2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_CALL_ToNonZeroBalance_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ZeroValue_CALL_ToNonZeroBalance_OOGRevertFiller.json
index 1d9e26aa3..1d9e26aa3 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_CALL_ToNonZeroBalance_OOGRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ZeroValue_CALL_ToNonZeroBalance_OOGRevertFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_CALL_ToOneStorageKey2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ZeroValue_CALL_ToOneStorageKey2Filler.json
index c88b1bb8e..c88b1bb8e 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_CALL_ToOneStorageKey2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ZeroValue_CALL_ToOneStorageKey2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_CALL_ToOneStorageKey_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ZeroValue_CALL_ToOneStorageKey_OOGRevertFiller.json
index 9dd6f18c9..9dd6f18c9 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_CALL_ToOneStorageKey_OOGRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ZeroValue_CALL_ToOneStorageKey_OOGRevertFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_SUICIDE_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ZeroValue_SUICIDE_OOGRevertFiller.json
index 7542568e9..7542568e9 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_SUICIDE_OOGRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ZeroValue_SUICIDE_OOGRevertFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_SUICIDE_ToEmpty_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ZeroValue_SUICIDE_ToEmpty_OOGRevertFiller.json
index ca4053a79..ca4053a79 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_SUICIDE_ToEmpty_OOGRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ZeroValue_SUICIDE_ToEmpty_OOGRevertFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevertFiller.json
index b43357ab1..b43357ab1 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevertFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_SUICIDE_ToOneStorageKey_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ZeroValue_SUICIDE_ToOneStorageKey_OOGRevertFiller.json
index 3d7aee123..3d7aee123 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_SUICIDE_ToOneStorageKey_OOGRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_ZeroValue_SUICIDE_ToOneStorageKey_OOGRevertFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callOutput1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callOutput1Filler.json
index 10caab2e8..10caab2e8 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callOutput1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callOutput1Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callOutput2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callOutput2Filler.json
index 0a3a965be..0a3a965be 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callOutput2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callOutput2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callOutput3FailFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callOutput3FailFiller.json
index da198b243..da198b243 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callOutput3FailFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callOutput3FailFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callOutput3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callOutput3Filler.json
index da6adbe0d..da6adbe0d 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callOutput3Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callOutput3Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callOutput3partialFailFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callOutput3partialFailFiller.json
index dd9d4fd97..dd9d4fd97 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callOutput3partialFailFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callOutput3partialFailFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callOutput3partialFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callOutput3partialFiller.json
index c973f8b04..c973f8b04 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callOutput3partialFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callOutput3partialFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callWithHighValueAndGasOOGFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callWithHighValueAndGasOOGFiller.json
index 840350c7c..840350c7c 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callWithHighValueAndGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callWithHighValueAndGasOOGFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callWithHighValueAndOOGatTxLevelFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callWithHighValueAndOOGatTxLevelFiller.json
index b7183b50b..b7183b50b 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callWithHighValueAndOOGatTxLevelFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callWithHighValueAndOOGatTxLevelFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callWithHighValueFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callWithHighValueFiller.json
index adb79686e..adb79686e 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callWithHighValueFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callWithHighValueFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callWithHighValueOOGinCallFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callWithHighValueOOGinCallFiller.json
index 60cc81e44..60cc81e44 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callWithHighValueOOGinCallFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callWithHighValueOOGinCallFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_call_OOG_additionalGasCosts1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_call_OOG_additionalGasCosts1Filler.json
index 802ffb154..802ffb154 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_call_OOG_additionalGasCosts1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_call_OOG_additionalGasCosts1Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_call_OOG_additionalGasCosts2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_call_OOG_additionalGasCosts2Filler.json
index 8ab951dec..8ab951dec 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_call_OOG_additionalGasCosts2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_call_OOG_additionalGasCosts2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecall_010_OOGMAfterFiller.json
index 75b715624..75b715624 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecall_010_OOGMAfterFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecall_010_OOGMAfter_2Filler.json
index ace0681a5..ace0681a5 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecall_010_OOGMAfter_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter_3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecall_010_OOGMAfter_3Filler.json
index 628c1a445..628c1a445 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter_3Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecall_010_OOGMAfter_3Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMBefore2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecall_010_OOGMBefore2Filler.json
index 5d8ba9ade..5d8ba9ade 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMBefore2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecall_010_OOGMBefore2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecall_010_OOGMBeforeFiller.json
index b18faba61..b18faba61 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecall_010_OOGMBeforeFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideEnd2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecall_010_SuicideEnd2Filler.json
index b4352fe45..b4352fe45 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideEnd2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecall_010_SuicideEnd2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecall_010_SuicideEndFiller.json
index 2c3feb0bb..2c3feb0bb 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecall_010_SuicideEndFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideMiddle2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecall_010_SuicideMiddle2Filler.json
index e44dfdf57..e44dfdf57 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideMiddle2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecall_010_SuicideMiddle2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecall_010_SuicideMiddleFiller.json
index d5b1c0d48..d5b1c0d48 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecall_010_SuicideMiddleFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_ABCB_RECURSIVE2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecall_ABCB_RECURSIVE2Filler.json
index 7058e4952..7058e4952 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_ABCB_RECURSIVE2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecall_ABCB_RECURSIVE2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecall_ABCB_RECURSIVEFiller.json
index 2e416307d..2e416307d 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecall_ABCB_RECURSIVEFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011Filler.json
index 2a28ffbc0..2a28ffbc0 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011_2Filler.json
index a965eae82..a965eae82 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGEFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011_OOGEFiller.json
index 002e64df2..002e64df2 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011_OOGEFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGE_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011_OOGE_2Filler.json
index ef3f8f608..ef3f8f608 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGE_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011_OOGE_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011_OOGMAfter2Filler.json
index 1d775aa1e..1d775aa1e 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011_OOGMAfter2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011_OOGMAfterFiller.json
index 4815b0cbd..4815b0cbd 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011_OOGMAfterFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011_OOGMAfter_1Filler.json
index 5a9d87395..5a9d87395 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011_OOGMAfter_1Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011_OOGMAfter_2Filler.json
index a1120ab5d..a1120ab5d 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMAfter_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011_OOGMAfter_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMBefore2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011_OOGMBefore2Filler.json
index f04feb2fc..f04feb2fc 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMBefore2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011_OOGMBefore2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011_OOGMBeforeFiller.json
index fc519188d..fc519188d 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011_OOGMBeforeFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_SuicideEnd2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011_SuicideEnd2Filler.json
index fd5af0f97..fd5af0f97 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_SuicideEnd2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011_SuicideEnd2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011_SuicideEndFiller.json
index 64a5a5dce..64a5a5dce 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011_SuicideEndFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_SuicideMiddle2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011_SuicideMiddle2Filler.json
index 75ea9fc86..75ea9fc86 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_SuicideMiddle2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011_SuicideMiddle2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011_SuicideMiddleFiller.json
index 44ec8f86e..44ec8f86e 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_011_SuicideMiddleFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_ABCB_RECURSIVE2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_ABCB_RECURSIVE2Filler.json
index 530e2b912..530e2b912 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_ABCB_RECURSIVE2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_ABCB_RECURSIVE2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_ABCB_RECURSIVEFiller.json
index f159eb182..f159eb182 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcallcodecallcode_ABCB_RECURSIVEFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcode_checkPCFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcode_checkPCFiller.json
index 9e0049e1f..9e0049e1f 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcode_checkPCFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcode_checkPCFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecall_10Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecall_10Filler.json
index 3f16f0494..3f16f0494 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecall_10Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecall_10Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecall_10_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecall_10_2Filler.json
index b6e80bd9f..b6e80bd9f 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecall_10_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecall_10_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecall_10_OOGEFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecall_10_OOGEFiller.json
index 07a128805..07a128805 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecall_10_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecall_10_OOGEFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecall_10_OOGE_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecall_10_OOGE_2Filler.json
index 10738e848..10738e848 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecall_10_OOGE_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecall_10_OOGE_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecall_10_SuicideEnd2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecall_10_SuicideEnd2Filler.json
index 6458255d3..6458255d3 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecall_10_SuicideEnd2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecall_10_SuicideEnd2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecall_10_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecall_10_SuicideEndFiller.json
index b8e44ecf8..b8e44ecf8 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecall_10_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecall_10_SuicideEndFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100Filler.json
index 7df498568..7df498568 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100_2Filler.json
index 3ed37f54e..3ed37f54e 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGE2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100_OOGE2Filler.json
index 34813f3b0..34813f3b0 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGE2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100_OOGE2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGEFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100_OOGEFiller.json
index 9b0aef21c..9b0aef21c 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100_OOGEFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMAfter2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100_OOGMAfter2Filler.json
index 230782133..230782133 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMAfter2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100_OOGMAfter2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100_OOGMAfterFiller.json
index 95dfa9a21..95dfa9a21 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100_OOGMAfterFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMAfter_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100_OOGMAfter_2Filler.json
index ee5e3865e..ee5e3865e 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMAfter_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100_OOGMAfter_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMAfter_3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100_OOGMAfter_3Filler.json
index 7d8fc6515..7d8fc6515 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMAfter_3Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100_OOGMAfter_3Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMBefore2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100_OOGMBefore2Filler.json
index 8680d711f..8680d711f 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMBefore2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100_OOGMBefore2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100_OOGMBeforeFiller.json
index 2b6c46614..2b6c46614 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100_OOGMBeforeFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_SuicideEnd2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100_SuicideEnd2Filler.json
index aa494d02b..aa494d02b 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_SuicideEnd2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100_SuicideEnd2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100_SuicideEndFiller.json
index d992a2411..d992a2411 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100_SuicideEndFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_SuicideMiddle2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100_SuicideMiddle2Filler.json
index d11663f35..d11663f35 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_SuicideMiddle2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100_SuicideMiddle2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100_SuicideMiddleFiller.json
index 2473dd1d9..2473dd1d9 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_100_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_100_SuicideMiddleFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_ABCB_RECURSIVE2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_ABCB_RECURSIVE2Filler.json
index e263cc347..e263cc347 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_ABCB_RECURSIVE2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_ABCB_RECURSIVE2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_ABCB_RECURSIVEFiller.json
index ff9c7301c..ff9c7301c 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcall_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcall_ABCB_RECURSIVEFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101Filler.json
index 019dac9e6..019dac9e6 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101_2Filler.json
index b2456997f..b2456997f 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGEFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101_OOGEFiller.json
index 393b3aade..393b3aade 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101_OOGEFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGE_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101_OOGE_2Filler.json
index 9f8373f90..9f8373f90 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGE_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101_OOGE_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMAfter2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101_OOGMAfter2Filler.json
index d23557ff2..d23557ff2 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMAfter2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101_OOGMAfter2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101_OOGMAfterFiller.json
index 7b5f65d33..7b5f65d33 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101_OOGMAfterFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMAfter_1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101_OOGMAfter_1Filler.json
index 5c1e06d7b..5c1e06d7b 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMAfter_1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101_OOGMAfter_1Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMAfter_3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101_OOGMAfter_3Filler.json
index 3c4a6f8c3..3c4a6f8c3 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMAfter_3Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101_OOGMAfter_3Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMBefore2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101_OOGMBefore2Filler.json
index efe8e42af..efe8e42af 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMBefore2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101_OOGMBefore2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101_OOGMBeforeFiller.json
index 674790bc6..674790bc6 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101_OOGMBeforeFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_SuicideEnd2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101_SuicideEnd2Filler.json
index d0ff145e6..d0ff145e6 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_SuicideEnd2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101_SuicideEnd2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101_SuicideEndFiller.json
index 0c50d3d14..0c50d3d14 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101_SuicideEndFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_SuicideMiddle2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101_SuicideMiddle2Filler.json
index 8d7f6d752..8d7f6d752 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_SuicideMiddle2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101_SuicideMiddle2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101_SuicideMiddleFiller.json
index 189251e6d..189251e6d 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_101_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_101_SuicideMiddleFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_ABCB_RECURSIVE2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_ABCB_RECURSIVE2Filler.json
index ce38014a0..ce38014a0 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_ABCB_RECURSIVE2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_ABCB_RECURSIVE2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_ABCB_RECURSIVEFiller.json
index 5186812fe..5186812fe 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcallcode_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcallcode_ABCB_RECURSIVEFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_1102Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_1102Filler.json
index 1399d3285..1399d3285 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_1102Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_1102Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110Filler.json
index 46ad433f3..46ad433f3 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110_2Filler.json
index 1399d3285..1399d3285 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGE2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110_OOGE2Filler.json
index 4a2e3ee64..4a2e3ee64 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGE2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110_OOGE2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGEFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110_OOGEFiller.json
index 9773cacdc..9773cacdc 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110_OOGEFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMAfter2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110_OOGMAfter2Filler.json
index 47dae0f3d..47dae0f3d 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMAfter2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110_OOGMAfter2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110_OOGMAfterFiller.json
index 148b58226..148b58226 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110_OOGMAfterFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMAfter_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110_OOGMAfter_2Filler.json
index 6c89d2003..6c89d2003 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMAfter_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110_OOGMAfter_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMAfter_3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110_OOGMAfter_3Filler.json
index 529c7676c..529c7676c 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMAfter_3Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110_OOGMAfter_3Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMBefore2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110_OOGMBefore2Filler.json
index e6f15b515..e6f15b515 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMBefore2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110_OOGMBefore2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110_OOGMBeforeFiller.json
index 23bc61841..23bc61841 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110_OOGMBeforeFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_SuicideEnd2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110_SuicideEnd2Filler.json
index 58d2e2ca0..58d2e2ca0 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_SuicideEnd2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110_SuicideEnd2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110_SuicideEndFiller.json
index 9fe15f353..9fe15f353 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110_SuicideEndFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_SuicideMiddle2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110_SuicideMiddle2Filler.json
index 286ab5978..286ab5978 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_SuicideMiddle2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110_SuicideMiddle2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110_SuicideMiddleFiller.json
index bc515c703..bc515c703 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_110_SuicideMiddleFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_ABCB_RECURSIVE2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_ABCB_RECURSIVE2Filler.json
index cdf0503f1..cdf0503f1 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_ABCB_RECURSIVE2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_ABCB_RECURSIVE2Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_ABCB_RECURSIVEFiller.json
index 5a739a451..5a739a451 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecall_ABCB_RECURSIVEFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecallcode_111_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecallcode_111_SuicideEndFiller.json
index aafe3d123..aafe3d123 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecallcode_111_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_callcodecallcodecallcode_111_SuicideEndFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json
index 894cc2332..894cc2332 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json
index 09ff782f0..09ff782f0 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log0_emptyMemFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log0_emptyMemFiller.json
index 87fe60505..87fe60505 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log0_emptyMemFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log0_emptyMemFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log0_logMemStartTooHighFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log0_logMemStartTooHighFiller.json
index 6f747db13..6f747db13 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log0_logMemStartTooHighFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log0_logMemStartTooHighFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log0_logMemsizeTooHighFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log0_logMemsizeTooHighFiller.json
index 69fc069bb..69fc069bb 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log0_logMemsizeTooHighFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log0_logMemsizeTooHighFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log0_logMemsizeZeroFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log0_logMemsizeZeroFiller.json
index 34433b73e..34433b73e 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log0_logMemsizeZeroFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log0_logMemsizeZeroFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log0_nonEmptyMemFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log0_nonEmptyMemFiller.json
index ccf88cb35..ccf88cb35 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log0_nonEmptyMemFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log0_nonEmptyMemFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log0_nonEmptyMem_logMemSize1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log0_nonEmptyMem_logMemSize1Filler.json
index c3dd8246f..c3dd8246f 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log0_nonEmptyMem_logMemSize1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log0_nonEmptyMem_logMemSize1Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log0_nonEmptyMem_logMemSize1_logMemStart31Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log0_nonEmptyMem_logMemSize1_logMemStart31Filler.json
index e6ff51410..e6ff51410 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log0_nonEmptyMem_logMemSize1_logMemStart31Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log0_nonEmptyMem_logMemSize1_logMemStart31Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log1_CallerFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log1_CallerFiller.json
index 1acb969f0..1acb969f0 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log1_CallerFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log1_CallerFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log1_MaxTopicFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log1_MaxTopicFiller.json
index feb23c0df..feb23c0df 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log1_MaxTopicFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log1_MaxTopicFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log1_emptyMemFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log1_emptyMemFiller.json
index 0e8db864c..0e8db864c 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log1_emptyMemFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log1_emptyMemFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log1_logMemStartTooHighFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log1_logMemStartTooHighFiller.json
index da3cb4ccd..da3cb4ccd 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log1_logMemStartTooHighFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log1_logMemStartTooHighFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log1_logMemsizeTooHighFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log1_logMemsizeTooHighFiller.json
index 58a016e57..58a016e57 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log1_logMemsizeTooHighFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log1_logMemsizeTooHighFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log1_logMemsizeZeroFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log1_logMemsizeZeroFiller.json
index e478e8201..e478e8201 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log1_logMemsizeZeroFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log1_logMemsizeZeroFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log1_nonEmptyMemFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log1_nonEmptyMemFiller.json
index fe0353ff5..fe0353ff5 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log1_nonEmptyMemFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log1_nonEmptyMemFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log1_nonEmptyMem_logMemSize1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log1_nonEmptyMem_logMemSize1Filler.json
index 9996f6d6e..9996f6d6e 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log1_nonEmptyMem_logMemSize1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log1_nonEmptyMem_logMemSize1Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log1_nonEmptyMem_logMemSize1_logMemStart31Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log1_nonEmptyMem_logMemSize1_logMemStart31Filler.json
index 9f3cdd9c4..9f3cdd9c4 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log1_nonEmptyMem_logMemSize1_logMemStart31Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log1_nonEmptyMem_logMemSize1_logMemStart31Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log2_CallerFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log2_CallerFiller.json
index 108f13407..108f13407 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log2_CallerFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log2_CallerFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log2_MaxTopicFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log2_MaxTopicFiller.json
index ad2cf521b..ad2cf521b 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log2_MaxTopicFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log2_MaxTopicFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log2_emptyMemFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log2_emptyMemFiller.json
index a4b2557ea..a4b2557ea 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log2_emptyMemFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log2_emptyMemFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log2_logMemStartTooHighFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log2_logMemStartTooHighFiller.json
index 205ca9cbb..205ca9cbb 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log2_logMemStartTooHighFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log2_logMemStartTooHighFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log2_logMemsizeTooHighFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log2_logMemsizeTooHighFiller.json
index cdd02eaa3..cdd02eaa3 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log2_logMemsizeTooHighFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log2_logMemsizeTooHighFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log2_logMemsizeZeroFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log2_logMemsizeZeroFiller.json
index 13cfe0ae7..13cfe0ae7 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log2_logMemsizeZeroFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log2_logMemsizeZeroFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log2_nonEmptyMemFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log2_nonEmptyMemFiller.json
index 798859cec..798859cec 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log2_nonEmptyMemFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log2_nonEmptyMemFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log2_nonEmptyMem_logMemSize1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log2_nonEmptyMem_logMemSize1Filler.json
index 9030fec0a..9030fec0a 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log2_nonEmptyMem_logMemSize1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log2_nonEmptyMem_logMemSize1Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log2_nonEmptyMem_logMemSize1_logMemStart31Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log2_nonEmptyMem_logMemSize1_logMemStart31Filler.json
index 615149e78..615149e78 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log2_nonEmptyMem_logMemSize1_logMemStart31Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log2_nonEmptyMem_logMemSize1_logMemStart31Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log3_CallerFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log3_CallerFiller.json
index c3a056e95..c3a056e95 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log3_CallerFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log3_CallerFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log3_MaxTopicFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log3_MaxTopicFiller.json
index d2bdeae9a..d2bdeae9a 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log3_MaxTopicFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log3_MaxTopicFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log3_PCFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log3_PCFiller.json
index adb36977a..adb36977a 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log3_PCFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log3_PCFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log3_emptyMemFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log3_emptyMemFiller.json
index 945ff9f22..945ff9f22 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log3_emptyMemFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log3_emptyMemFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log3_logMemStartTooHighFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log3_logMemStartTooHighFiller.json
index 315a4d30a..315a4d30a 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log3_logMemStartTooHighFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log3_logMemStartTooHighFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log3_logMemsizeTooHighFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log3_logMemsizeTooHighFiller.json
index 24b64c0a8..24b64c0a8 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log3_logMemsizeTooHighFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log3_logMemsizeTooHighFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log3_logMemsizeZeroFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log3_logMemsizeZeroFiller.json
index 2ac8451d1..2ac8451d1 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log3_logMemsizeZeroFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log3_logMemsizeZeroFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log3_nonEmptyMemFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log3_nonEmptyMemFiller.json
index d14c0efb1..d14c0efb1 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log3_nonEmptyMemFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log3_nonEmptyMemFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log3_nonEmptyMem_logMemSize1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log3_nonEmptyMem_logMemSize1Filler.json
index 6d98bd14d..6d98bd14d 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log3_nonEmptyMem_logMemSize1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log3_nonEmptyMem_logMemSize1Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log3_nonEmptyMem_logMemSize1_logMemStart31Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log3_nonEmptyMem_logMemSize1_logMemStart31Filler.json
index e3edb402e..e3edb402e 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log3_nonEmptyMem_logMemSize1_logMemStart31Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log3_nonEmptyMem_logMemSize1_logMemStart31Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log4_CallerFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log4_CallerFiller.json
index 8db8f9ba0..8db8f9ba0 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log4_CallerFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log4_CallerFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log4_MaxTopicFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log4_MaxTopicFiller.json
index 2e8f47925..2e8f47925 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log4_MaxTopicFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log4_MaxTopicFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log4_PCFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log4_PCFiller.json
index e5a7d3a56..e5a7d3a56 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log4_PCFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log4_PCFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log4_emptyMemFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log4_emptyMemFiller.json
index acca8a112..acca8a112 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log4_emptyMemFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log4_emptyMemFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log4_logMemStartTooHighFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log4_logMemStartTooHighFiller.json
index 3eeb7f647..3eeb7f647 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log4_logMemStartTooHighFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log4_logMemStartTooHighFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log4_logMemsizeTooHighFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log4_logMemsizeTooHighFiller.json
index 86e1930ed..86e1930ed 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log4_logMemsizeTooHighFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log4_logMemsizeTooHighFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log4_logMemsizeZeroFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log4_logMemsizeZeroFiller.json
index da17539b4..da17539b4 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log4_logMemsizeZeroFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log4_logMemsizeZeroFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log4_nonEmptyMemFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log4_nonEmptyMemFiller.json
index 0c4432ffd..0c4432ffd 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log4_nonEmptyMemFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log4_nonEmptyMemFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log4_nonEmptyMem_logMemSize1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log4_nonEmptyMem_logMemSize1Filler.json
index 87d44cdde..87d44cdde 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log4_nonEmptyMem_logMemSize1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log4_nonEmptyMem_logMemSize1Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log4_nonEmptyMem_logMemSize1_logMemStart31Filler.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log4_nonEmptyMem_logMemSize1_logMemStart31Filler.json
index 2ab96ee07..2ab96ee07 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log4_nonEmptyMem_logMemSize1_logMemStart31Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_log4_nonEmptyMem_logMemSize1_logMemStart31Filler.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_logInOOG_CallFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_logInOOG_CallFiller.json
index 0f2667d87..0f2667d87 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_logInOOG_CallFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_logInOOG_CallFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_makeMoneyFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_makeMoneyFiller.json
index badb2b3d4..badb2b3d4 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_makeMoneyFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_makeMoneyFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_refundSuicide50procentCapFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_refundSuicide50procentCapFiller.json
index b49ee2d14..b49ee2d14 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_refundSuicide50procentCapFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_refundSuicide50procentCapFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_refund_CallAFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_refund_CallAFiller.json
index 177f4bf6a..177f4bf6a 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_refund_CallAFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_refund_CallAFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_refund_CallA_OOGFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_refund_CallA_OOGFiller.json
index 23600668a..23600668a 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_refund_CallA_OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_refund_CallA_OOGFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_refund_CallA_notEnoughGasInCallFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_refund_CallA_notEnoughGasInCallFiller.json
index 5c3a93498..5c3a93498 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_refund_CallA_notEnoughGasInCallFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_refund_CallA_notEnoughGasInCallFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_refund_CallToSuicideNoStorageFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_refund_CallToSuicideNoStorageFiller.json
index 99b7ec811..99b7ec811 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_refund_CallToSuicideNoStorageFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_refund_CallToSuicideNoStorageFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_refund_CallToSuicideStorageFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_refund_CallToSuicideStorageFiller.json
index 6351fceec..6351fceec 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_refund_CallToSuicideStorageFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_refund_CallToSuicideStorageFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_refund_CallToSuicideTwiceFiller.json b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_refund_CallToSuicideTwiceFiller.json
index 6948922cb..6948922cb 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_refund_CallToSuicideTwiceFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/stStaticCallPending/static_refund_CallToSuicideTwiceFiller.json
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcall_00_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcall_00_SuicideEndFiller.json
index 8dff7492d..f0049132e 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcall_00_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcall_00_SuicideEndFiller.json
@@ -38,7 +38,7 @@
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{   (STATICCALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  (MSTORE 32 1) (STATICCALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_2Filler.json
index 4b0326f33..59681b225 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcallcode_001_2Filler.json
@@ -91,7 +91,7 @@
             },
             "1000000000000000000000000000000000000003" : {
                 "balance" : "0",
-                "code" : "{  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE)) }",
+                "code" : "{  (MSTORE 1 0x11223344) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -112,7 +112,7 @@
             },
             "2000000000000000000000000000000000000002" : {
                 "balance" : "1000000000000000000",
-                "code" : "{  (MSTORE 4 1) (CALLCODE 250000 0x2000000000000000000000000000000000000003 3 0 64 0 64 ) (MSTORE 6 1) }",
+                "code" : "{  (MSTORE 4 1) (CALLCODE 250000 0x2000000000000000000000000000000000000003 0 0 64 0 64 ) (MSTORE 6 1) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_2Filler.json
index 50c85e546..fc5ded686 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_2Filler.json
@@ -10,43 +10,76 @@
         },
         "expect" : [
             {
-                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["ALL"],
+                "indexes" : { "data" : 0, "gas" : -1, "value" : -1 },
+                "network" : ["Metropolis"],
                 "result" : {
-                    "1000000000000000000000000000000000000001" : {
-                        "storage" : {
-                            "0x01" : "0x00",
-                            "0x02" : "0x00",
-                            "0x04" : "0x00",
-                            "0x07" : "0x00",
-                            "0xe6" : "0x00",
-                            "0xe8" : "0x00",
-                            "0xec" : "0x00",
-                            "0xee" : "0x00",
-                            "0xf0" : "0x00"
-                        }
-                    }
+		    "a000000000000000000000000000000000000000" : {
+		        "storage" : {
+			    "0x00" : "0x01",
+			    "0x01" : "0x2d031d"
+		        }
+		    }
+                }
+            },
+	    {
+                "indexes" : { "data" : 1, "gas" : -1, "value" : -1 },
+                "network" : ["Metropolis"],
+                "result" : {
+		    "a000000000000000000000000000000000000000" : {
+		        "storage" : {
+			    "0x00" : "0x01",
+			    "0x01" : "0x2d1d3d"
+		        }
+		    }
                 }
             }
         ],
         "pre" : {
+	    "a000000000000000000000000000000000000000" : {
+                "balance" : "1000000000000000000",
+                "code" : "{  [[ 0 ]] (CALLCODE (GAS) (CALLDATALOAD 0) 0 0 0 0 0) [[ 1 ]] (GAS) }",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
             "1000000000000000000000000000000000000000" : {
                 "balance" : "1000000000000000000",
-                "code" : "{  [[ 0 ]] (STATICCALL 350000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
+                "code" : "{  (STATICCALL 350000 0x1000000000000000000000000000000000000001 0 32 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "1000000000000000000",
-                "code" : "{  [[ 1 ]] (CALLCODE 250000 0x1000000000000000000000000000000000000002 2 0 64 0 64 ) }",
+                "code" : "{  (CALLCODE 250000 0x1000000000000000000000000000000000000002 2 0 32 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "0",
-                "code" : "{  (SSTORE 2 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 230 (ADDRESS)) (SSTORE 232 (ORIGIN)) (SSTORE 236 (CALLDATASIZE)) (SSTORE 238 (CODESIZE)) (SSTORE 240 (GASPRICE)) }",
+                "code" : "{  (MSTORE 0 0x11223344) }",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "2000000000000000000000000000000000000000" : {
+                "balance" : "1000000000000000000",
+                "code" : "{  (STATICCALL 350000 0x2000000000000000000000000000000000000001 0 32 0 64 ) }",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "2000000000000000000000000000000000000001" : {
+                "balance" : "1000000000000000000",
+                "code" : "{  (MSTORE 0 (CALLDATALOAD 0)) (CALLCODE 250000 0x2000000000000000000000000000000000000002 0 0 32 0 64 ) }",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "2000000000000000000000000000000000000002" : {
+                "balance" : "0",
+                "code" : "{  (MSTORE 0 0x11223344) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -61,7 +94,8 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x0000000000000000000000001000000000000000000000000000000000000000",
+		"0x0000000000000000000000002000000000000000000000000000000000000000"
             ],
             "gasLimit" : [
                 "3000000"
@@ -69,7 +103,7 @@
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "to" : "1000000000000000000000000000000000000000",
+            "to" : "a000000000000000000000000000000000000000",
             "value" : [
                 "0"
             ]
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_OOGE_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_OOGE_2Filler.json
index 40d604afa..174f238e2 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_OOGE_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_OOGE_2Filler.json
@@ -11,40 +11,28 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["ALL"],
+                "network" : ["Metropolis"],
                 "result" : {
-	    "1000000000000000000000000000000000000000" : {
-                "storage" : {
-			"0x00" : "0x00",
-			"0x01" : "0x00",
-			"0x02" : "0x00"
-                }
-            },
-            "1000000000000000000000000000000000000001" : {
-                "storage" : {
-			"0x01" : "0x00",
-			"0x02" : "0x00"
-                }
-            },
-            "1000000000000000000000000000000000000002" : {
-                "storage" : {
-			"0x02" : "0x00"
-                }
-            }
+		    "1000000000000000000000000000000000000000" : {
+		        "storage" : {
+				"0x00" : "0x01",
+				"0x01" : "0x01aac5"
+		        }
+		    }
                 }
             }
         ],
         "pre" : {
             "1000000000000000000000000000000000000000" : {
                 "balance" : "1000000000000000000",
-                "code" : "{  [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
+                "code" : "{  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 32 0 64 ) [[ 1 ]] (GAS) }",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "0",
-                "code" : "{  [[ 1 ]] (CALLCODE 20020 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }",
+                "code" : "{  (CALLCODE 20020 (CALLDATALOAD 0) 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -56,6 +44,13 @@
                 "storage" : {
                 }
             },
+            "2000000000000000000000000000000000000002" : {
+                "balance" : "0",
+                "code" : "{  (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)  ) }",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1000000000000000000",
                 "code" : "",
@@ -66,7 +61,8 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x0000000000000000000000001000000000000000000000000000000000000002",
+		"0x0000000000000000000000002000000000000000000000000000000000000002"
             ],
             "gasLimit" : [
                 "172000"
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_SuicideEnd2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_SuicideEnd2Filler.json
index 7be63eb4a..e8857d519 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_SuicideEnd2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_SuicideEnd2Filler.json
@@ -11,10 +11,15 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["ALL"],
+                "network" : ["Metropolis"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
-                        "balance" : "1000000000000000000"
+                        "balance" : "1000000000000000000",
+                        "storage" : {
+                            "0x00" : "0x00",
+			    "0x01" : "0x2b1467"
+                        }
+			
                     },
                     "1000000000000000000000000000000000000002" : {
                         "balance" : "10000000000",
@@ -28,21 +33,21 @@
         "pre" : {
             "1000000000000000000000000000000000000000" : {
                 "balance" : "1000000000000000000",
-                "code" : "{  [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
+                "code" : "{  [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) [[ 1 ]] (GAS) }",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  (CALLCODE 50000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SSTORE 2 1) }",
+                "code" : "{  (MSTORE 2 1) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_SuicideEndFiller.json
index 5c968fbbf..955ff3ee7 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_SuicideEndFiller.json
@@ -20,7 +20,7 @@
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
                             "0x00" : "0x00",
-                            "0x02" : "0x00"
+                            "0x01" : "0x2b1467"
                         }
                     },
                     "1000000000000000000000000000000000000001" : {
@@ -45,21 +45,21 @@
         "pre" : {
             "1000000000000000000000000000000000000000" : {
                 "balance" : "1000000000000000000",
-                "code" : "{  [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
+                "code" : "{  [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) [[ 1 ]] (GAS) }",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "10000000000",
-                "code" : "{  [[ 1 ]] (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
+                "code" : "{  (DELEGATECALL 50000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "10000000000",
-                "code" : "{  (SSTORE 2 1) }",
+                "code" : "{  (MSTORE 2 1) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010Filler.json
index f4db8c1ce..06c3a9eac 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010Filler.json
@@ -19,32 +19,8 @@
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
-                            "0x00" : "0x00",
-                            "0x02" : "0x00"
-                        }
-                    },
-                    "1000000000000000000000000000000000000001" : {
-                        "storage" : {
-                            "0x01" : "0x00",
-                            "0x02" : "0x00",
-                            "0x05" : "0x00"
-                        }
-                    },
-                    "1000000000000000000000000000000000000002" : {
-                        "storage" : {
-                            "0x02" : "0x00"
-                        }
-                    },
-                    "1000000000000000000000000000000000000003" : {
-                        "storage" : {
-                            "0x014a" : "0x00",
-                            "0x014c" : "0x00",
-                            "0x0150" : "0x00",
-                            "0x0152" : "0x00",
-                            "0x0154" : "0x00",
-                            "0x03" : "0x00",
-                            "0x04" : "0x00",
-                            "0x07" : "0x00"
+                            "0x00" : "0x01",
+                            "0x01" : "0x2d1de0"
                         }
                     }
                 }
@@ -53,28 +29,28 @@
         "pre" : {
             "1000000000000000000000000000000000000000" : {
                 "balance" : "1000000000000000000",
-                "code" : "{  [[ 0 ]] (STATICCALL 350000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
+                "code" : "{  [[ 0 ]] (STATICCALL 350000 0x1000000000000000000000000000000000000001 0 64 0 64 ) [[ 1 ]] (GAS) }",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "1000000000000000000",
-                "code" : "{  [[ 1 ]] (DELEGATECALL 300000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
+                "code" : "{  (MSTORE 3 1)  (DELEGATECALL 300000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (MSTORE 3 1) }",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "1000000000000000000",
-                "code" : "{  [[ 2 ]] (STATICCALL 250000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SSTORE 5 (CALLER))}",
+                "code" : "{  (MSTORE 3 1) (STATICCALL 250000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (MSTORE 3 1)}",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "1000000000000000000000000000000000000003" : {
                 "balance" : "0",
-                "code" : "{  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE)) }",
+                "code" : "{  (MSTORE 1 1) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_2Filler.json
index f786b2bb0..59d6a4a9c 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_2Filler.json
@@ -10,25 +10,25 @@
         },
         "expect" : [
             {
-                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["ALL"],
+                "indexes" : { "data" : 0, "gas" : -1, "value" : -1 },
+                "network" : ["Metropolis"],
                 "result" : {
-                    "1000000000000000000000000000000000000001" : {
+                    "1000000000000000000000000000000000000000" : {
                         "storage" : {
-                            "0x01" : "0x00",
-                            "0x02" : "0x00"
+                            "0x00" : "0x01",
+                            "0x01" : "0x2d02d6"
                         }
-                    },
-                    "1000000000000000000000000000000000000003" : {
+                    }
+                }
+            },
+	    {
+                "indexes" : { "data" : 1, "gas" : -1, "value" : -1 },
+                "network" : ["Metropolis"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
                         "storage" : {
-                            "0x014a" : "0x00",
-                            "0x014c" : "0x00",
-                            "0x0150" : "0x00",
-                            "0x0152" : "0x00",
-                            "0x0154" : "0x00",
-                            "0x03" : "0x00",
-                            "0x04" : "0x00",
-                            "0x07" : "0x00"
+                            "0x00" : "0x01",
+                            "0x01" : "0x2d1d02"
                         }
                     }
                 }
@@ -37,28 +37,35 @@
         "pre" : {
             "1000000000000000000000000000000000000000" : {
                 "balance" : "1000000000000000000",
-                "code" : "{  [[ 0 ]] (STATICCALL 350000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
+                "code" : "{  [[ 0 ]] (STATICCALL 350000 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] (GAS) }",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "1000000000000000000",
-                "code" : "{  [[ 1 ]] (CALLCODE 300000 0x1000000000000000000000000000000000000002 2 0 64 0 64 ) }",
+                "code" : "{  (CALLCODE 300000 0x1000000000000000000000000000000000000002 2 0 64 0 64 ) }",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "2000000000000000000000000000000000000001" : {
+                "balance" : "1000000000000000000",
+                "code" : "{  (CALLCODE 300000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "1000000000000000000",
-                "code" : "{  [[ 2 ]] (STATICCALL 250000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{  (STATICCALL 250000 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "1000000000000000000000000000000000000003" : {
                 "balance" : "0",
-                "code" : "{  (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE)) }",
+                "code" : "{  (MSTORE 3 1) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -73,7 +80,8 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x0000000000000000000000001000000000000000000000000000000000000001",
+		"0x0000000000000000000000002000000000000000000000000000000000000001"
             ],
             "gasLimit" : [
                 "3000000"
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGEFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGEFiller.json
index 5ba0658dc..465327a5c 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGEFiller.json
@@ -19,32 +19,8 @@
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
-                            "0x00" : "0x00",
-                            "0x02" : "0x00",
-                            "0x03" : "0x00"
-                        }
-                    },
-                    "1000000000000000000000000000000000000001" : {
-                        "storage" : {
-                            "0x01" : "0x00",
-                            "0x02" : "0x00",
-                            "0x03" : "0x00"
-                        }
-                    },
-                    "1000000000000000000000000000000000000002" : {
-                        "storage" : {
-                            "0x02" : "0x00",
-                            "0x03" : "0x00"
-                        }
-                    },
-                    "1000000000000000000000000000000000000003" : {
-                        "storage" : {
-                            "0x03" : "0x00"
-                        }
-                    },
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "storage" : {
-                            "0x01" : "0x00"
+                            "0x00" : "0x01",
+                            "0x01" : "0x01a7d2"
                         }
                     }
                 }
@@ -53,28 +29,35 @@
         "pre" : {
             "1000000000000000000000000000000000000000" : {
                 "balance" : "1000000000000000000",
-                "code" : "{  [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
+                "code" : "{ (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) [[ 1 ]] (GAS) }",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "0",
-                "code" : "{  [[ 1 ]] (DELEGATECALL 100000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
+                "code" : "{   (DELEGATECALL 100000 (CALLDATALOAD 0) 0 64 0 64 ) (MSTORE 1 1) }",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "0",
-                "code" : "{  [[ 2 ]] (STATICCALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{  (STATICCALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "2000000000000000000000000000000000000002" : {
+                "balance" : "0",
+                "code" : "{  (STATICCALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) (STORE 1 1) }",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "1000000000000000000000000000000000000003" : {
                 "balance" : "0",
-                "code" : "{  (SSTORE 3 1) (MSTORE 3 1) }",
+                "code" : "{  (MSTORE 3 1) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -89,7 +72,8 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x0000000000000000000000001000000000000000000000000000000000000002",
+                "0x0000000000000000000000002000000000000000000000000000000000000002"
             ],
             "gasLimit" : [
                 "172000"
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGE_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGE_2Filler.json
index 068998625..0a9268d98 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGE_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGE_2Filler.json
@@ -11,35 +11,12 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["ALL"],
+                "network" : ["Metropolis"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00",
-                            "0x02" : "0x00",
-                            "0x03" : "0x00"
-                        }
-                    },
-                    "1000000000000000000000000000000000000001" : {
-                        "storage" : {
-                            "0x00" : "0x00",
-			    "0x01" : "0x00",
-			    "0x02" : "0x00",
-			    "0x03" : "0x00"
-                        }
-                    },
-                    "1000000000000000000000000000000000000002" : {
-                        "storage" : {
-                            "0x00" : "0x00",
-			    "0x01" : "0x00",
-			    "0x02" : "0x00",
-			    "0x03" : "0x00"
-                        }
-                    },
-                    "1000000000000000000000000000000000000003" : {
-                        "storage" : {
-                            "0x03" : "0x00"
+                            "0x00" : "0x01",
+                            "0x01" : "0x01a7e5"
                         }
                     }
                 }
@@ -48,28 +25,35 @@
         "pre" : {
             "1000000000000000000000000000000000000000" : {
                 "balance" : "1000000000000000000",
-                "code" : "{  [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
+                "code" : "{  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 32 0 64 ) [[ 1 ]] (GAS) }",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "0",
-                "code" : "{  [[ 1 ]] (CALLCODE 100000 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) }",
+                "code" : "{  (MSTORE 0 (CALLDATALOAD 0)) (CALLCODE 100000 0x1000000000000000000000000000000000000002 0 0 32 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "0",
-                "code" : "{  [[ 2 ]] (STATICCALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{  (STATICCALL 20020 (CALLDATALOAD 0) 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "1000000000000000000000000000000000000003" : {
                 "balance" : "0",
-                "code" : "{  (SSTORE 3 1) (MSTORE 3 1) }",
+                "code" : "{  (SSTORE 3 1) }",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "2000000000000000000000000000000000000003" : {
+                "balance" : "0",
+                "code" : "{  (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -84,7 +68,8 @@
         },
         "transaction" : {
             "data" : [
-                ""
+		"0x0000000000000000000000001000000000000000000000000000000000000003",
+		"0x0000000000000000000000002000000000000000000000000000000000000003"
             ],
             "gasLimit" : [
                 "172000"
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter2Filler.json
index 95fcbea0f..5ccac8c53 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGMAfter2Filler.json
@@ -16,30 +16,7 @@
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
                             "0x00" : "0x00",
-                            "0x01" : "0x00",
-                            "0x02" : "0x00",
-                            "0x03" : "0x00"
-                        }
-                    },
-                    "1000000000000000000000000000000000000001" : {
-                        "storage" : {
-			    "0x00" : "0x00",
-                            "0x01" : "0x00",
-                            "0x02" : "0x00",
-                            "0x03" : "0x00"
-                        }
-                    },
-                    "1000000000000000000000000000000000000002" : {
-                        "storage" : {
-			    "0x00" : "0x00",
-                            "0x01" : "0x00",
-                            "0x02" : "0x00",
-                            "0x03" : "0x00"
-                        }
-                    },
-                    "1000000000000000000000000000000000000003" : {
-                        "storage" : {
-                            "0x03" : "0x00"
+                            "0x01" : "0x014b7e"
                         }
                     }
                 }
@@ -48,28 +25,35 @@
         "pre" : {
             "1000000000000000000000000000000000000000" : {
                 "balance" : "1000000000000000000",
-                "code" : "{  [[ 0 ]] (STATICCALL 60150 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
+                "code" : "{  [[ 0 ]] (STATICCALL 60150 (CALLDATALOAD 0) 0 64 0 64 ) [[ 1 ]] (GAS) }",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "0",
-                "code" : "{  [[ 1 ]] (CALLCODE 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (MSTORE 3 1) }",
+                "code" : "{  (CALLCODE 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "2000000000000000000000000000000000000001" : {
+                "balance" : "0",
+                "code" : "{  (CALLCODE 40080 0x1000000000000000000000000000000000000002 0 0 64 0 64 ) (SSTORE 1 1) }",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "0",
-                "code" : "{  [[ 2 ]] (STATICCALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
+                "code" : "{  (STATICCALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "1000000000000000000000000000000000000003" : {
                 "balance" : "0",
-                "code" : "{  (SSTORE 3 1) }",
+                "code" : "{  (MSTORE 3 1) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -84,7 +68,8 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x0000000000000000000000001000000000000000000000000000000000000001",
+                "0x0000000000000000000000002000000000000000000000000000000000000001"
             ],
             "gasLimit" : [
                 "172000"
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_calldelcode_01Filler.json
index e5aa299f0..e78863da8 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_calldelcode_01Filler.json
@@ -1,5 +1,5 @@
 {
-    "static_callcallcode_01" : {
+    "static_calldelcode_01" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -19,25 +19,8 @@
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
-                            "0x00" : "0x00"
-                        }
-                    },
-                    "1000000000000000000000000000000000000001" : {
-                        "storage" : {
-                            "0x01" : "0x00",
-                            "0x02" : "0x00",
-                            "0x04" : "0x00",
-                            "0x07" : "0x00",
-                            "0xe6" : "0x00",
-                            "0xe8" : "0x00",
-                            "0xec" : "0x00",
-                            "0xee" : "0x00",
-                            "0xf0" : "0x00"
-                        }
-                    },
-                    "1000000000000000000000000000000000000002" : {
-                        "storage" : {
-                            "0x04" : "0x00"
+                            "0x00" : "0x01",
+			    "0x01" : "0x2d20dc"
                         }
                     }
                 }
@@ -46,21 +29,21 @@
         "pre" : {
             "1000000000000000000000000000000000000000" : {
                 "balance" : "1000000000000000000",
-                "code" : "{  [[ 0 ]] (STATICCALL 350000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
+                "code" : "{  [[ 0 ]] (STATICCALL 350000 0x1000000000000000000000000000000000000001 0 64 0 64 ) [[ 1 ]] (GAS) }",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "0",
-                "code" : "{  [[ 1 ]] (DELEGATECALL 250000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
+                "code" : "{  (DELEGATECALL 250000 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "1000000000000000000000000000000000000002" : {
                 "balance" : "0",
-                "code" : "{  (SSTORE 2 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 230 (ADDRESS)) (SSTORE 232 (ORIGIN)) (SSTORE 236 (CALLDATASIZE)) (SSTORE 238 (CODESIZE)) (SSTORE 240 (GASPRICE)) }",
+                "code" : "{  (MSTORE 1 0x11223344) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_OOGEFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_calldelcode_01_OOGEFiller.json
index bf648b92b..1f19d6009 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcode_01_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_calldelcode_01_OOGEFiller.json
@@ -1,5 +1,5 @@
 {
-    "static_callcallcode_01_OOGE" : {
+    "static_calldelcode_01_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -19,20 +19,8 @@
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
-                            "0x00" : "0x00",
-                            "0x01" : "0x00",
-                            "0x02" : "0x00"
-                        }
-                    },
-                    "1000000000000000000000000000000000000001" : {
-                        "storage" : {
-                            "0x01" : "0x00",
-                            "0x02" : "0x00"
-                        }
-                    },
-                    "1000000000000000000000000000000000000002" : {
-                        "storage" : {
-                            "0x02" : "0x00"
+                            "0x00" : "0x01",
+                            "0x01" : "0x01aac8"
                         }
                     }
                 }
@@ -41,14 +29,14 @@
         "pre" : {
             "1000000000000000000000000000000000000000" : {
                 "balance" : "1000000000000000000",
-                "code" : "{  [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }",
+                "code" : "{  (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) [[ 1 ]] (GAS) }",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "1000000000000000000000000000000000000001" : {
                 "balance" : "0",
-                "code" : "{  [[ 1 ]] (DELEGATECALL 20020 0x1000000000000000000000000000000000000002 0 64 0 64 ) }",
+                "code" : "{  (DELEGATECALL 20020 (CALLDATALOAD 0) 0 64 0 64 ) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -60,6 +48,13 @@
                 "storage" : {
                 }
             },
+            "2000000000000000000000000000000000000002" : {
+                "balance" : "0",
+                "code" : "{  (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "1000000000000000000",
                 "code" : "",
@@ -70,7 +65,8 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x0000000000000000000000001000000000000000000000000000000000000002",
+		"0x0000000000000000000000002000000000000000000000000000000000000002"
             ],
             "gasLimit" : [
                 "172000"